mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-06 06:26:12 +02:00
Code

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>
This commit is contained in:
Sergey Organov 2021-05-21 00:47:01 +03:00 committed by Junio C Hamano
parent 23f6d40dd3
commit 1e20a407fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/stash.c
View File

@ -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
View File

@ -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}