fetch: allow explicit --refmap to override configuration

diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 2c482b622b4a9e68bb0614dec8e156d5dfc8fa06..d8f23f488e00dad97eeb5d22f5f0db01bcab8021 100755 (executable)
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -11,11 +11,24 @@ test_expect_success 'setup' '
        mkdir sub
 '
 
-test_expect_success '"git log :/" should be ambiguous' '
-       test_must_fail git log :/ 2>error &&
+test_expect_success '"git log :/" should not be ambiguous' '
+       git log :/
+'
+
+test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
+       : >a &&
+       test_must_fail git log :/a 2>error &&
        grep ambiguous error
 '
 
+test_expect_success '"git log :/a -- " should not be ambiguous' '
+       git log :/a --
+'
+
+test_expect_success '"git log -- :/a" should not be ambiguous' '
+       git log -- :/a
+'
+
 test_expect_success '"git log :" should be ambiguous' '
        test_must_fail git log : 2>error &&
        grep ambiguous error
@@ -33,4 +46,19 @@ test_expect_success 'git log HEAD -- :/' '
        test_cmp expected actual
 '
 
+test_expect_success 'command line pathspec parsing for "git log"' '
+       git reset --hard &&
+       >a &&
+       git add a &&
+       git commit -m "add an empty a" --allow-empty &&
+       echo 1 >a &&
+       git commit -a -m "update a to 1" &&
+       git checkout HEAD^ &&
+       echo 2 >a &&
+       git commit -a -m "update a to 2" &&
+       test_must_fail git merge master &&
+       git add a &&
+       git log --merge -- a
+'
+
 test_done