diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-18 22:08:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-18 22:08:41 -0700 |
| commit | 2c57ebc22329e11fc4843f62fe464a4e0c212176 (patch) | |
| tree | d9618fa4497ae60fe5503bed0d673704eb2e1b48 /builtin-diff.c | |
| parent | c7b345b075ee5395992f3fb9d1d860bb350256d7 (diff) | |
| parent | 52db0495dcb88f38590bc00607052fc5758b07d1 (diff) | |
| download | git-2c57ebc22329e11fc4843f62fe464a4e0c212176.tar.gz | |
Merge branch 'ts/doctar' into next
* ts/doctar:
Documentation/Makefile: create tarballs for the man pages and html files
SubmittingPatches: The download location of External Editor has moved
Make git-check-format-ref a builtin.
Make "git rev-list" be a builtin
builtin-diff: do not say files are renamed when blob and file are given
Provide a way to flush git-diff-tree's output
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index 95d2c699b9..27451d5613 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; |