builtin-diff: do not say files are renamed when blob and file are given
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
@ -122,7 +122,7 @@ static int builtin_diff_b_f(struct rev_info *revs,
|
|||||||
stuff_change(&revs->diffopt,
|
stuff_change(&revs->diffopt,
|
||||||
canon_mode(st.st_mode), canon_mode(st.st_mode),
|
canon_mode(st.st_mode), canon_mode(st.st_mode),
|
||||||
blob[0].sha1, null_sha1,
|
blob[0].sha1, null_sha1,
|
||||||
blob[0].name, path);
|
path, path);
|
||||||
diffcore_std(&revs->diffopt);
|
diffcore_std(&revs->diffopt);
|
||||||
diff_flush(&revs->diffopt);
|
diff_flush(&revs->diffopt);
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user