From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 05:58:51 +0000 (-0800)
Subject: Merge branch 'maint-1.7.7' into maint
X-Git-Tag: v1.7.8.1~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8311158c66e0d83df950ea837fb1cb332c51f798;p=git.git

Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
  Git 1.7.7.5
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf
  checkout,merge: loosen overwriting untracked file check based on info/exclude
  cast variable in call to free() in builtin/diff.c and submodule.c
  apply: get rid of useless x < 0 comparison on a size_t type

Conflicts:
	Documentation/git.txt
	GIT-VERSION-GEN
	RelNotes
	builtin/fetch.c
---

8311158c66e0d83df950ea837fb1cb332c51f798
diff --cc Documentation/git.txt
index e869032fc,5c313e521..da7d48787
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,14 -44,13 +44,18 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v1.7.8/git.html[documentation for release 1.7.8]
 +
 +* release notes for
 +  link:RelNotes/1.7.8.txt[1.7.8].
 +
- * link:v1.7.7.1/git.html[documentation for release 1.7.7.1]
+ * link:v1.7.7.5/git.html[documentation for release 1.7.7.5]
  
  * release notes for
+   link:RelNotes/1.7.7.5.txt[1.7.7.5],
+   link:RelNotes/1.7.7.4.txt[1.7.7.4],
+   link:RelNotes/1.7.7.3.txt[1.7.7.3],
+   link:RelNotes/1.7.7.2.txt[1.7.7.2],
    link:RelNotes/1.7.7.1.txt[1.7.7.1],
    link:RelNotes/1.7.7.txt[1.7.7].
  
diff --cc builtin/fetch.c
index 91731b909,59dfba518..8761a33b4
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -461,18 -451,16 +471,19 @@@ static int store_updated_refs(const cha
  				shown_url = 1;
  			}
  			if (verbosity >= 0)
- 				fprintf(stderr, " %s\n", note);
+ 				fprintf(stderr, " %s\n", note.buf);
  		}
  	}
 -	free(url);
 -	fclose(fp);
 +
  	if (rc & STORE_REF_ERROR_DF_CONFLICT)
  		error(_("some local refs could not be updated; try running\n"
  		      " 'git remote prune %s' to remove any old, conflicting "
  		      "branches"), remote_name);
 +
 + abort:
+ 	strbuf_release(&note);
 +	free(url);
 +	fclose(fp);
  	return rc;
  }