projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support 'master@2 hours ago' syntax
[git.git]
/
builtin-diff.c
diff --git
a/builtin-diff.c
b/builtin-diff.c
index
d3ac581
..
b0c9cad
100644
(file)
--- a/
builtin-diff.c
+++ b/
builtin-diff.c
@@
-132,7
+132,9
@@
static int builtin_diff_blobs(struct rev_info *revs,
int argc, const char **argv,
struct blobinfo *blob)
{
int argc, const char **argv,
struct blobinfo *blob)
{
- /* Blobs */
+ /* Blobs: the arguments are reversed when setup_revisions()
+ * picked them up.
+ */
unsigned mode = canon_mode(S_IFREG | 0644);
while (1 < argc) {
unsigned mode = canon_mode(S_IFREG | 0644);
while (1 < argc) {
@@
-145,8
+147,8
@@
static int builtin_diff_blobs(struct rev_info *revs,
}
stuff_change(&revs->diffopt,
mode, mode,
}
stuff_change(&revs->diffopt,
mode, mode,
- blob[
0].sha1, blob[1
].sha1,
- blob[
1].name, blob[1
].name);
+ blob[
1].sha1, blob[0
].sha1,
+ blob[
0].name, blob[0
].name);
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
return 0;
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
return 0;