Merge branch 'rr/rebase-autostash-fix'

diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh
index 426b319bd36257331f07d5aee1a20ed7e515408a..51dedab29b682749990fb29a3f11134a2629f941 100755 (executable)
--- a/t/t5001-archive-attr.sh
+++ b/t/t5001-archive-attr.sh
@@ -4,7 +4,7 @@ test_description='git archive attribute tests'
 
 . ./test-lib.sh
 
-SUBSTFORMAT=%H%n
+SUBSTFORMAT='%H (%h)%n'
 
 test_expect_exists() {
        test_expect_success " $1 exists" "test -e $1"
@@ -57,6 +57,15 @@ test_expect_missing  worktree/ignored
 test_expect_exists     worktree/ignored-by-tree
 test_expect_missing    worktree/ignored-by-worktree
 
+test_expect_success 'git archive --worktree-attributes option' '
+       git archive --worktree-attributes --worktree-attributes HEAD >worktree.tar &&
+       (mkdir worktree2 && cd worktree2 && "$TAR" xf -) <worktree.tar
+'
+
+test_expect_missing    worktree2/ignored
+test_expect_exists     worktree2/ignored-by-tree
+test_expect_missing    worktree2/ignored-by-worktree
+
 test_expect_success 'git archive vs. bare' '
        (cd bare && git archive HEAD) >bare-archive.tar &&
        test_cmp archive.tar bare-archive.tar
@@ -78,14 +87,4 @@ test_expect_success 'export-subst' '
        test_cmp substfile2 archive/substfile2
 '
 
-test_expect_success 'git tar-tree vs. git archive with worktree attributes' '
-       git tar-tree HEAD >tar-tree.tar &&
-       test_cmp worktree.tar tar-tree.tar
-'
-
-test_expect_success 'git tar-tree vs. git archive with worktree attrs, bare' '
-       (cd bare && git tar-tree HEAD) >bare-tar-tree.tar &&
-       test_cmp bare-worktree.tar bare-tar-tree.tar
-'
-
 test_done