Merge branch 'nd/command-list-gen-fix'

diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 08b0fddf24f0e1520e4e0a9d8bb7731b81ba5eff..e497c1358f8b2da6960d3d73db3cc75f9f7df85c 100755 (executable)
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -134,21 +134,30 @@ test_expect_success 'changed commit with --no-patch diff option' '
 '
 
 test_expect_success 'changed commit with --stat diff option' '
-       four_spaces="    " &&
        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(-)
-       $four_spaces
        2:  fccce22 = 2:  f51d370 s/4/A/
             a => b | 0
             1 file changed, 0 insertions(+), 0 deletions(-)
-       $four_spaces
        3:  147e64e ! 3:  0559556 s/11/B/
             a => b | 0
             1 file changed, 0 insertions(+), 0 deletions(-)
-       $four_spaces
+       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 &&
+       1:  4de457d = 1:  a4b3333 s/5/A/
+       2:  fccce22 = 2:  f51d370 s/4/A/
+       3:  147e64e ! 3:  0559556 s/11/B/
            @@ -10,7 +10,7 @@
              9
              10
@@ -159,9 +168,6 @@ test_expect_success 'changed commit with --stat diff option' '
              13
              14
        4:  a63e992 ! 4:  d966c5c s/12/B/
-            a => b | 0
-            1 file changed, 0 insertions(+), 0 deletions(-)
-       $four_spaces
            @@ -8,7 +8,7 @@
             @@
              9
@@ -175,6 +181,11 @@ test_expect_success 'changed commit with --stat diff option' '
        test_cmp expected actual
 '
 
+test_expect_success 'no commits on one side' '
+       git commit --amend -m "new message" &&
+       git range-diff master HEAD@{1} HEAD
+'
+
 test_expect_success 'changed message' '
        git range-diff --no-color topic...changed-message >actual &&
        sed s/Z/\ /g >expected <<-EOF &&
@@ -186,15 +197,54 @@ test_expect_success 'changed message' '
            Z
            +    Also a silly comment here!
            +
-           Zdiff --git a/file b/file
-           Z--- a/file
-           Z+++ b/file
+           Z diff --git a/file b/file
+           Z --- a/file
+           Z +++ b/file
        3:  147e64e = 3:  b9cb956 s/11/B/
        4:  a63e992 = 4:  8add5f1 s/12/B/
        EOF
        test_cmp expected actual
 '
 
+test_expect_success 'dual-coloring' '
+       sed -e "s|^:||" >expect <<-\EOF &&
+       :<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
+       :<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
+       :    <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
+       :     <RESET>
+       :         s/4/A/<RESET>
+       :     <RESET>
+       :    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
+       :    <REVERSE><GREEN>+<RESET>
+       :      diff --git a/file b/file<RESET>
+       :      --- a/file<RESET>
+       :      +++ b/file<RESET>
+       :<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
+       :    <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>
+       :      9<RESET>
+       :      10<RESET>
+       :    <RED> -11<RESET>
+       :    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
+       :    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
+       :      12<RESET>
+       :      13<RESET>
+       :      14<RESET>
+       :<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
+       :    <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET>
+       :    <CYAN> @@<RESET>
+       :      9<RESET>
+       :      10<RESET>
+       :    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
+       :    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
+       :    <RED> -12<RESET>
+       :    <GREEN> +B<RESET>
+       :      13<RESET>
+       EOF
+       git range-diff changed...changed-message --color --dual-color >actual.raw &&
+       test_decode_color >actual <actual.raw &&
+       test_cmp expect actual
+'
+
 for prev in topic master..topic
 do
        test_expect_success "format-patch --range-diff=$prev" '
@@ -207,4 +257,9 @@ do
        '
 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
+'
+
 test_done