From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2009 02:44:52 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~119
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23807fa0086ae6ad6980a2a1071f23ed1a6dde93;p=git.git

Merge branch 'maint'

* maint:
  Prepare for 1.6.3.2
  fix cat-file usage message and documentation
  fetch: report ref storage DF errors more accurately
  lock_ref: inform callers of unavailable ref
  merge-options.txt: Clarify merge --squash

Conflicts:
	RelNotes
---

23807fa0086ae6ad6980a2a1071f23ed1a6dde93
diff --cc builtin-fetch.c
index 77acabfcc,1f7a3f1ce..1eec64e9c
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@@ -384,9 -381,8 +389,9 @@@ static int store_updated_refs(const cha
  				fprintf(stderr, " %s\n", note);
  		}
  	}
 +	free(url);
  	fclose(fp);
- 	if (rc & 2)
+ 	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);