summaryrefslogtreecommitdiff
path: root/builtin/stash.c
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2021-05-20 21:47:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-21 00:24:14 (GMT)
commit1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d (patch)
tree1fd1c8010aae4774bf1b33365d1468aabd8ee56f /builtin/stash.c
parent23f6d40dd3e7aad72c7706bb75f77a6c73b69b56 (diff)
downloadgit-1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d.zip
git-1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d.tar.gz
git-1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d.tar.bz2
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>
Diffstat (limited to 'builtin/stash.c')
-rw-r--r--builtin/stash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/stash.c b/builtin/stash.c
index ba774cc..7c92bb5 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, "--");