summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-03 22:56:59 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-03 22:56:59 -0700
commite2b1accc59ab5d682d71fd801ebe959c3e871488 (patch)
treefe7ff753798566ed54d2ac8af556ccc58cb4f471 /diff.c
parentf6b78c6eb626d477b252d39ef2801d4670675a2b (diff)
parented5f07a6fdc5653e24a5bd6c216d12bc878496bd (diff)
downloadgit-e2b1accc59ab5d682d71fd801ebe959c3e871488.tar.gz
Merge branch 'maint'
* maint: Document -<n> for git-format-patch glossary: add 'reflog' diff --no-index: fix --name-status with added files Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index b6eb72be02..19589707c4 100644
--- a/diff.c
+++ b/diff.c
@@ -2418,7 +2418,8 @@ static void diff_flush_raw(struct diff_filepair *p,
printf("%s ",
diff_unique_abbrev(p->two->sha1, abbrev));
}
- printf("%s%c%s", status, inter_name_termination, path_one);
+ printf("%s%c%s", status, inter_name_termination,
+ two_paths || p->one->mode ? path_one : path_two);
if (two_paths)
printf("%c%s", inter_name_termination, path_two);
putchar(line_termination);