Merge branch 'jc/grep-author-all-match-implicit'

diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index 74e6443664010196f2694304179917fdadc53c01..9df301211c7f03e4a9edb0ccb9b1a7a648f97d8c 100755 (executable)
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -189,4 +189,10 @@ test_expect_success 'absolute pathspec should fail gracefully' '
        )
 '
 
+test_expect_success 'make_relative_path handles double slashes in GIT_DIR' '
+       : > dummy_file
+       echo git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file &&
+       git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file
+'
+
 test_done