Browse Source

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>
maint
Sergey Organov 4 years ago committed by Junio C Hamano
parent
commit
1e20a407fe
  1. 2
      builtin/stash.c
  2. 2
      t/t3903-stash.sh

2
builtin/stash.c

@ -759,7 +759,7 @@ static int list_stash(int argc, const char **argv, const char *prefix) @@ -759,7 +759,7 @@ static int list_stash(int argc, const char **argv, const char *prefix)

cp.git_cmd = 1;
strvec_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
"--first-parent", "-m", NULL);
"--first-parent", NULL);
strvec_pushv(&cp.args, argv);
strvec_push(&cp.args, ref_stash);
strvec_push(&cp.args, "--");

2
t/t3903-stash.sh

@ -859,7 +859,7 @@ test_expect_success 'setup stash with index and worktree changes' ' @@ -859,7 +859,7 @@ test_expect_success 'setup stash with index and worktree changes' '
git stash
'

test_expect_success 'stash list implies --first-parent -m' '
test_expect_success 'stash list -p shows simple diff' '
cat >expect <<-EOF &&
stash@{0}


Loading…
Cancel
Save