pretty: add support for separator option in %(trailers)

diff --git a/t/t1005-read-tree-reset.sh b/t/t1005-read-tree-reset.sh
index e29cf635995bffa72515fd1133157d73b08d943e..83b09e1310676cc4ca092ff30c6da50aa6e635fd 100755 (executable)
--- a/t/t1005-read-tree-reset.sh
+++ b/t/t1005-read-tree-reset.sh
@@ -33,7 +33,7 @@ test_expect_success 'reset should remove remnants from a failed merge' '
        git ls-files -s >expect &&
        sha1=$(git rev-parse :new) &&
        (
-               echo "100644 $sha1 1    old"
+               echo "100644 $sha1 1    old" &&
                echo "100644 $sha1 3    old"
        ) | git update-index --index-info &&
        >old &&
@@ -43,12 +43,27 @@ test_expect_success 'reset should remove remnants from a failed merge' '
        ! test -f old
 '
 
+test_expect_success 'two-way reset should remove remnants too' '
+       read_tree_u_must_succeed --reset -u HEAD &&
+       git ls-files -s >expect &&
+       sha1=$(git rev-parse :new) &&
+       (
+               echo "100644 $sha1 1    old" &&
+               echo "100644 $sha1 3    old"
+       ) | git update-index --index-info &&
+       >old &&
+       git ls-files -s &&
+       read_tree_u_must_succeed --reset -u HEAD HEAD &&
+       git ls-files -s >actual &&
+       ! test -f old
+'
+
 test_expect_success 'Porcelain reset should remove remnants too' '
        read_tree_u_must_succeed --reset -u HEAD &&
        git ls-files -s >expect &&
        sha1=$(git rev-parse :new) &&
        (
-               echo "100644 $sha1 1    old"
+               echo "100644 $sha1 1    old" &&
                echo "100644 $sha1 3    old"
        ) | git update-index --index-info &&
        >old &&
@@ -63,7 +78,7 @@ test_expect_success 'Porcelain checkout -f should remove remnants too' '
        git ls-files -s >expect &&
        sha1=$(git rev-parse :new) &&
        (
-               echo "100644 $sha1 1    old"
+               echo "100644 $sha1 1    old" &&
                echo "100644 $sha1 3    old"
        ) | git update-index --index-info &&
        >old &&
@@ -78,7 +93,7 @@ test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
        git ls-files -s >expect &&
        sha1=$(git rev-parse :new) &&
        (
-               echo "100644 $sha1 1    old"
+               echo "100644 $sha1 1    old" &&
                echo "100644 $sha1 3    old"
        ) | git update-index --index-info &&
        >old &&