sequencer: lib'ify do_pick_commit()

diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 72300b5f244504540a551854cb82f81cf5391a55..001343e2fc2722506172e702266f5bab6278d1e8 100755 (executable)
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -18,7 +18,7 @@ test_expect_success '"git log :/" should not be ambiguous' '
 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_i18ngrep ambiguous error
 '
 
 test_expect_success '"git log :/a -- " should not be ambiguous' '
@@ -31,7 +31,7 @@ test_expect_success '"git log -- :/a" should not be ambiguous' '
 
 test_expect_success '"git log :" should be ambiguous' '
        test_must_fail git log : 2>error &&
-       grep ambiguous error
+       test_i18ngrep ambiguous error
 '
 
 test_expect_success 'git log -- :' '
@@ -46,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