stash list: stop passing "-m" to "git log"
Passing "-m" in "git log --first-parent -m" is not needed as --first-parent implies --diff-merges=first-parent anyway. OTOH, it will stop being harmless once we let "-m" imply "-p". While we are at it, fix corresponding test description in t3903-stash to match what it actually tests. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
May 21, 2021 at 00:47 UTC
1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d
2 files changed
+2
-2
builtin/stash.c
+1
-1
@@ -759,7 +759,7 @@ static int list_stash(int argc, const char **argv, const char *prefix)
759
760
cp.git_cmd = 1;
761
strvec_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
762
- "--first-parent", "-m", NULL);
762
+ "--first-parent", NULL);
763
strvec_pushv(&cp.args, argv);
764
strvec_push(&cp.args, ref_stash);
765
strvec_push(&cp.args, "--");
t/t3903-stash.sh
+1
-1
@@ -859,7 +859,7 @@ test_expect_success 'setup stash with index and worktree changes' '
859
git stash
860
'
861
862
-test_expect_success 'stash list implies --first-parent -m' '
862
+test_expect_success 'stash list -p shows simple diff' '
863
cat >expect <<-EOF &&
864
stash@{0}
865