summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-18 21:35:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-18 21:35:37 (GMT)
commit065e0b126f47e0c280da6830956766ff2ea8cf17 (patch)
treef15c4bf9c72f359c76a9df7f10c107a2e8f523d6
parent70f75cc96a3c590ac1c54c09c39446626f155ef7 (diff)
downloadgit-065e0b126f47e0c280da6830956766ff2ea8cf17.zip
git-065e0b126f47e0c280da6830956766ff2ea8cf17.tar.gz
git-065e0b126f47e0c280da6830956766ff2ea8cf17.tar.bz2
builtin-diff: do not say files are renamed when blob and file are given
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index b0c9cad..de81b05 100644
--- 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,
- blob[0].name, path);
+ path, path);
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
return 0;