diff options
| author | Sergey Organov <sorganov@gmail.com> | 2021-05-21 00:47:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-21 09:24:14 +0900 |
| commit | 1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d (patch) | |
| tree | 1fd1c8010aae4774bf1b33365d1468aabd8ee56f | |
| parent | 23f6d40dd3e7aad72c7706bb75f77a6c73b69b56 (diff) | |
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>
| -rw-r--r-- | builtin/stash.c | 2 | ||||
| -rwxr-xr-x | t/t3903-stash.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index ba774cce67..7c92bb51cb 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -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, "--"); diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 5f282ecf61..873aa56e35 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -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} |