projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document git aliases support
[git.git]
/
builtin-diff.c
diff --git
a/builtin-diff.c
b/builtin-diff.c
index
d3ac581
..
27451d5
100644
(file)
--- a/
builtin-diff.c
+++ b/
builtin-diff.c
@@
-122,7
+122,7
@@
static int builtin_diff_b_f(struct rev_info *revs,
stuff_change(&revs->diffopt,
canon_mode(st.st_mode), canon_mode(st.st_mode),
blob[0].sha1, null_sha1,
stuff_change(&revs->diffopt,
canon_mode(st.st_mode), canon_mode(st.st_mode),
blob[0].sha1, null_sha1,
-
blob[0].name
, path);
+
path
, path);
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
return 0;
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
return 0;
@@
-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;
@@
-231,7
+233,7
@@
static int builtin_diff_combined(struct rev_info *revs,
return 0;
}
return 0;
}
-
static
void add_head(struct rev_info *revs)
+void add_head(struct rev_info *revs)
{
unsigned char sha1[20];
struct object *obj;
{
unsigned char sha1[20];
struct object *obj;