path: root/t/
diff options
authorLinus Torvalds <>2007-10-09 16:35:22 (GMT)
committerShawn O. Pearce <>2007-10-16 00:24:27 (GMT)
commit304b5af64f9b5a6b5e9455e2dcab381c568452b6 (patch)
tree475eab770fc6f36a88593ba7b17f958c0ad9fb4f /t/
parent99516e35d096f41e7133cacde8fbed8ee9a3ecd0 (diff)
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
This fixes an unnecessary empty line that we add to the log message when we generate diffs, but don't actually end up printing any due to having DIFF_FORMAT_NO_OUTPUT set. This can happen with pickaxe or with rename following. The reason is that we normally add an empty line between the commit and the diff, but we do that even for the case where we've then suppressed the actual printing of the diff. This also updates a couple of tests that assumed the extraneous empty line would exist at the end of output. Signed-off-by: Linus Torvalds <> Signed-off-by: Lars Hjemli <> Signed-off-by: Shawn O. Pearce <>
Diffstat (limited to 't/')
1 files changed, 1 insertions, 1 deletions
diff --git a/t/ b/t/
index fcbabe8..94b1c24 100755
--- a/t/
+++ b/t/
@@ -8,7 +8,7 @@ test_description='commit and log output encodings'
. ./
compare_with () {
- git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' -e '$d' >current &&
+ git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' >current &&
git diff current "$2"