summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fba0cbd)
raw | patch | inline | side by side (parent: fba0cbd)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 3 Aug 2006 18:50:10 +0000 (11:50 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 3 Aug 2006 18:50:10 +0000 (11:50 -0700) |
This was introduced by mistake when revision.c::add_pending_object()
was modified to use object-array instead of object-list.
Signed-off-by: Junio C Hamano <junkio@cox.net>
was modified to use object-array instead of object-list.
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-diff.c | patch | blob | history |
diff --git a/builtin-diff.c b/builtin-diff.c
index 48d2fd03b79c9c03e1e32b7743f936872a3684f1..ec27542d484b8a1d69d1ea5a57ba795f5a78b35c 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
int argc, const char **argv,
struct blobinfo *blob)
{
- /* Blobs: the arguments are reversed when setup_revisions()
- * picked them up.
- */
unsigned mode = canon_mode(S_IFREG | 0644);
if (argc > 1)
stuff_change(&revs->diffopt,
mode, mode,
- blob[1].sha1, blob[0].sha1,
+ blob[0].sha1, blob[1].sha1,
blob[0].name, blob[0].name);
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);