diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-23 14:55:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 16:23:10 -0700 |
| commit | b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298 (patch) | |
| tree | 8c15995be05c108072397d41d0454d6737509f7b /diff-tree.c | |
| parent | a4acb0eb140d80141ac564a09219a10c3ab76449 (diff) | |
| download | git-b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298.tar.gz | |
[PATCH] diff-raw format update take #2.
This changes the diff-raw format again, following the mailing
list discussion. The new format explicitly expresses which one
is a rename and which one is a copy.
The documentation and tests are updated to match this change.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-tree.c b/diff-tree.c index 2ec0d6fa81..0d21b18ff7 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -270,7 +270,7 @@ static int call_diff_flush(void) if (pickaxe) { diffcore_pickaxe(pickaxe); if (diff_queue_is_empty()) { - diff_flush(DIFF_FORMAT_NO_OUTPUT); + diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); return 0; } } @@ -291,7 +291,7 @@ static int call_diff_flush(void) } header = NULL; } - diff_flush(diff_output_format); + diff_flush(diff_output_format, 1); return 1; } |