tree-walk: copy object ID before use

diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 6aae36417122a8af5d010910fb2586aa9ec91815..048feaf6ddf845279b30b7f1ebb7056c60e01c6d 100755 (executable)
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -122,6 +122,36 @@ test_expect_success 'changed commit' '
        test_cmp expected actual
 '
 
+test_expect_success 'changed commit with --no-patch diff option' '
+       git range-diff --no-color --no-patch topic...changed >actual &&
+       cat >expected <<-EOF &&
+       1:  4de457d = 1:  a4b3333 s/5/A/
+       2:  fccce22 = 2:  f51d370 s/4/A/
+       3:  147e64e ! 3:  0559556 s/11/B/
+       4:  a63e992 ! 4:  d966c5c s/12/B/
+       EOF
+       test_cmp expected actual
+'
+
+test_expect_success 'changed commit with --stat diff option' '
+       git range-diff --no-color --stat topic...changed >actual &&
+       cat >expected <<-EOF &&
+       1:  4de457d = 1:  a4b3333 s/5/A/
+            a => b | 0
+            1 file changed, 0 insertions(+), 0 deletions(-)
+       2:  fccce22 = 2:  f51d370 s/4/A/
+            a => b | 0
+            1 file changed, 0 insertions(+), 0 deletions(-)
+       3:  147e64e ! 3:  0559556 s/11/B/
+            a => b | 0
+            1 file changed, 0 insertions(+), 0 deletions(-)
+       4:  a63e992 ! 4:  d966c5c s/12/B/
+            a => b | 0
+            1 file changed, 0 insertions(+), 0 deletions(-)
+       EOF
+       test_cmp expected actual
+'
+
 test_expect_success 'changed commit with sm config' '
        git range-diff --no-color --submodule=log topic...changed >actual &&
        cat >expected <<-EOF &&
@@ -218,18 +248,24 @@ test_expect_success 'dual-coloring' '
 for prev in topic master..topic
 do
        test_expect_success "format-patch --range-diff=$prev" '
-               git format-patch --stdout --cover-letter --range-diff=$prev \
+               git format-patch --cover-letter --range-diff=$prev \
                        master..unmodified >actual &&
-               grep "= 1: .* s/5/A" actual &&
-               grep "= 2: .* s/4/A" actual &&
-               grep "= 3: .* s/11/B" actual &&
-               grep "= 4: .* s/12/B" actual
+               test_when_finished "rm 000?-*" &&
+               test_line_count = 5 actual &&
+               test_i18ngrep "^Range-diff:$" 0000-* &&
+               grep "= 1: .* s/5/A" 0000-* &&
+               grep "= 2: .* s/4/A" 0000-* &&
+               grep "= 3: .* s/11/B" 0000-* &&
+               grep "= 4: .* s/12/B" 0000-*
        '
 done
 
 test_expect_success 'format-patch --range-diff as commentary' '
-       git format-patch --stdout --range-diff=HEAD~1 HEAD~1 >actual &&
-       test_i18ngrep "^Range-diff:$" actual
+       git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
+       test_when_finished "rm 0001-*" &&
+       test_line_count = 1 actual &&
+       test_i18ngrep "^Range-diff:$" 0001-* &&
+       grep "> 1: .* new message" 0001-*
 '
 
 test_done