From: Junio C Hamano Date: Tue, 11 Sep 2012 18:23:45 +0000 (-0700) Subject: Sync with 1.7.11.6 X-Git-Tag: v1.7.12.1~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c88a6d17492b197b9b3298cbc34efa804928302;p=thirdparty%2Fgit.git Sync with 1.7.11.6 Signed-off-by: Junio C Hamano --- 1c88a6d17492b197b9b3298cbc34efa804928302 diff --cc Documentation/git.txt index 463d567a87,165d13ad22..fab6e77e02 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -43,14 -44,10 +43,15 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.7.12/git.html[documentation for release 1.7.12] + +* release notes for + link:RelNotes/1.7.12.txt[1.7.12]. + - * link:v1.7.11.5/git.html[documentation for release 1.7.11.5] + * link:v1.7.11.6/git.html[documentation for release 1.7.11.6] * release notes for + link:RelNotes/1.7.11.6.txt[1.7.11.6], link:RelNotes/1.7.11.5.txt[1.7.11.5], link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], diff --cc builtin/config.c index 8cd08da991,b44277c23e..ada6e12114 --- a/builtin/config.c +++ b/builtin/config.c @@@ -160,8 -160,8 +160,8 @@@ static int show_config(const char *key_ static int get_value(const char *key_, const char *regex_) { - int ret = -1; + int ret = CONFIG_GENERIC_ERROR; - char *global = NULL, *repo_config = NULL; + char *global = NULL, *xdg = NULL, *repo_config = NULL; const char *system_wide = NULL, *local; struct config_include_data inc = CONFIG_INCLUDE_INIT; config_fn_t fn; diff --cc merge-recursive.c index 39b2e165e0,e02da3556d..7866ca1026 --- a/merge-recursive.c +++ b/merge-recursive.c @@@ -788,8 -770,8 +770,8 @@@ static void update_file_flags(struct me mode = 0666; fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); if (fd < 0) - die_errno("failed to open '%s'", path); + die_errno(_("failed to open '%s'"), path); - flush_buffer(fd, buf, size); + write_in_full(fd, buf, size); close(fd); } else if (S_ISLNK(mode)) { char *lnk = xmemdupz(buf, size);