aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-06-22 17:02:13 +0200
committerJunio C Hamano <gitster@pobox.com>2016-06-24 15:20:47 -0700
commitc1496934cfd6603ac3fbf74cc3a16fcd584d5484 (patch)
tree9bacd6175b803e9f745e7bfbf30bf66c76c4baef
parent7f7d712bcfde8afe0a007042d5cb4b809617fb96 (diff)
downloadgit-c1496934cfd6603ac3fbf74cc3a16fcd584d5484.tar.gz
git-c1496934cfd6603ac3fbf74cc3a16fcd584d5484.tar.xz
t4211: ensure that log respects --output=<file>
The test script t4202-log.sh is already pretty long, and it is a good idea to test --output with a more obscure option, anyway. So let's test it in conjunction with line-log. The most important part of this test, of course, is to ensure that the file is not closed after writing the diff, but only at the very end of the log output. That is the entire reason why the test tries to generate a log that covers more than one commit. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4211-line-log.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 4451127eb..9d87777b5 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -99,4 +99,11 @@ test_expect_success '-L with --first-parent and a merge' '
git log --first-parent -L 1,1:b.c
'
+test_expect_success '-L with --output' '
+ git checkout parallel-change &&
+ git log --output=log -L :main:b.c >output &&
+ test ! -s output &&
+ test_line_count = 70 log
+'
+
test_done