diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-07 16:06:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-07 16:06:45 -0700 |
| commit | 7f498065e9bf85f6f3e954ec57dedf56fec29e01 (patch) | |
| tree | d5bd668d03aaa23fcfc280c861a77b29a598d758 /builtin-diff.c | |
| parent | Merge branch 'jc/cache-tree' into next (diff) | |
| parent | clone: don't clone the info/alternates file (diff) | |
| download | tgif-7f498065e9bf85f6f3e954ec57dedf56fec29e01.tar.xz | |
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
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index 20873162f9..71742aa10b 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -84,8 +84,7 @@ static void stuff_change(struct diff_options *opt, 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; |