undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/diff' into next

Browse Source 
* jc/diff:
  builtin-diff: fix comparison between two blobs.
This commit is contained in:
Junio C Hamano 2006-05-15 19:06:06 -07:00
commit 70bde2bc31
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-diff.c
View File

@ -132,7 +132,9 @@ static int builtin_diff_blobs(struct rev_info *revs,
int argc, const char **argv, int argc, const char **argv,
struct blobinfo *blob) struct blobinfo *blob)
{ {
/* Blobs */ /* Blobs: the arguments are reversed when setup_revisions()
* picked them up.
*/
unsigned mode = canon_mode(S_IFREG | 0644); unsigned mode = canon_mode(S_IFREG | 0644);
while (1 < argc) { while (1 < argc) {
@ -145,8 +147,8 @@ static int builtin_diff_blobs(struct rev_info *revs,
} }
stuff_change(&revs->diffopt, stuff_change(&revs->diffopt,
mode, mode, mode, mode,
blob[0].sha1, blob[1].sha1, blob[1].sha1, blob[0].sha1,
blob[1].name, blob[1].name); blob[0].name, blob[0].name);
diffcore_std(&revs->diffopt); diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt); diff_flush(&revs->diffopt);
return 0; return 0;