diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-22 21:27:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-22 21:27:37 -0800 |
| commit | e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1 (patch) | |
| tree | b0974609d67763a8580bba07839a528c6fab7042 /builtin-diff.c | |
| parent | 2470653196fa8461ff5895c521519e947482eae1 (diff) | |
| parent | 75b62b489af7b62a5518c3f199d2a2776205e088 (diff) | |
| download | git-e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1.tar.xz | |
Merge branch 'maint'
* maint:
git-diff: fix combined diff
Fix 'git commit -a' in a newly initialized repository
Include git-gui credits file in dist.
Document the new core.bare configuration option.
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index a6590205e8..c387ebb16c 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -192,7 +192,8 @@ static int builtin_diff_combined(struct rev_info *revs, parent = xmalloc(ents * sizeof(*parent)); /* Again, the revs are all reverse */ for (i = 0; i < ents; i++) - hashcpy((unsigned char*)parent + i, ent[ents - 1 - i].item->sha1); + hashcpy((unsigned char *)(parent + i), + ent[ents - 1 - i].item->sha1); diff_tree_combined(parent[0], parent + 1, ents - 1, revs->dense_combined_merges, revs); return 0; |