global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 04:00:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Hopefully final update of release notes before 1.7.8 final
  git-compat-util: don't assume value for undefined variable
  sha1_file: don't mix enum with int
  convert: don't mix enum with int
  http: remove unused function hex()
This commit is contained in:
Junio C Hamano
2011-11-18 14:19:54 -08:00
parent c27b83f95a f56ef114ee
commit c78003e1f7
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/RelNotes/1.7.8.txt
View File

@@ -162,7 +162,7 @@ included in this release.
---
exec >/var/tmp/1
O=v1.7.8-rc2-3-g09116a1
O=v1.7.8-rc3-16-g9e9ab40
echo O=$(git describe --always master)
git log --first-parent --oneline --reverse ^$O master
echo

6
convert.c
View File

@@ -641,7 +641,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
return 1;
}
static int git_path_check_crlf(const char *path, struct git_attr_check *check)
static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_check *check)
{
const char *value = check->value;
@@ -658,7 +658,7 @@ static int git_path_check_crlf(const char *path, struct git_attr_check *check)
return CRLF_GUESS;
}
static int git_path_check_eol(const char *path, struct git_attr_check *check)
static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
{
const char *value = check->value;
@@ -811,7 +811,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
src = dst->buf;
len = dst->len;
}
return ret | convert_to_git(path, src, len, dst, 0);
return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE);
}
/*****************************************************************

2
git-compat-util.h
View File

@@ -218,7 +218,7 @@ extern char *gitbasename(char *);
#define find_last_dir_sep(path) strrchr(path, '/')
#endif
#if __HP_cc >= 61000
#if defined(__HP_cc) && (__HP_cc >= 61000)
#define NORETURN __attribute__((noreturn))
#define NORETURN_PTR
#elif defined(__GNUC__) && !defined(NO_NORETURN)

8
http.c
View File

@@ -749,14 +749,6 @@ static inline int needs_quote(int ch)
return 1;
}
static inline int hex(int v)
{
if (v < 10)
return '0' + v;
else
return 'A' + v - 10;
}
static char *quote_ref_url(const char *base, const char *ref)
{
struct strbuf buf = STRBUF_INIT;

2
sha1_file.c
View File

@@ -2617,7 +2617,7 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size,
if ((type == OBJ_BLOB) && path) {
struct strbuf nbuf = STRBUF_INIT;
if (convert_to_git(path, buf, size, &nbuf,
write_object ? safe_crlf : 0)) {
write_object ? safe_crlf : SAFE_CRLF_FALSE)) {
buf = strbuf_detach(&nbuf, &size);
re_allocated = 1;
}