From: Junio C Hamano <junkio@cox.net>
Date: Sun, 7 May 2006 23:06:45 +0000 (-0700)
Subject: Merge branch 'mw/alternates' into next
X-Git-Tag: v1.4.1-rc1~126
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/7f498065e9bf85f6f3e954ec57dedf56fec29e01?hp=-c

Merge branch 'mw/alternates' into next

* mw/alternates:
clone: don't clone the info/alternates file
test case for transitive info/alternates
Transitively read alternatives
repack: honor -d even when no new pack was created
clone: keep --reference even with -l -s
repo-config: document what value_regexp does a bit more clearly.
Release config lock if the regex is invalid
core-tutorial.txt: escape asterisk
Sparse fix for builtin-diff
Fix users of prefix_path() to free() only when necessary
---

7f498065e9bf85f6f3e954ec57dedf56fec29e01
diff --combined builtin-diff.c
index 20873162f9,d3ac581f29..71742aa10b
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@@ -84,8 -84,7 +84,7 @@@ static void stuff_change(struct diff_op
  
  	if (opt->reverse_diff) {
  		unsigned tmp;
- 		const
- 			const unsigned char *tmp_u;
+ 		const unsigned char *tmp_u;
  		const char *tmp_c;
  		tmp = old_mode; old_mode = new_mode; new_mode = tmp;
  		tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u;
@@@ -232,7 -231,7 +231,7 @@@ static int builtin_diff_combined(struc
  	return 0;
  }
  
 -static void add_head(struct rev_info *revs)
 +void add_head(struct rev_info *revs)
  {
  	unsigned char sha1[20];
  	struct object *obj;