diff options
| -rw-r--r-- | builtin/stash.c | 3 | ||||
| -rwxr-xr-x | t/t3903-stash.sh | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 1977e50df2..01751ce28d 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -956,6 +956,7 @@ static void diff_include_untracked(const struct stash_info *info, struct diff_op static int show_stash(int argc, const char **argv, const char *prefix, struct repository *repo UNUSED) { + struct setup_revision_opt opt = { .free_removed_argv_elements = 1 }; int i; int ret = -1; struct stash_info info = STASH_INFO_INIT; @@ -1014,7 +1015,7 @@ static int show_stash(int argc, const char **argv, const char *prefix, } } - argc = setup_revisions(revision_args.nr, revision_args.v, &rev, NULL); + argc = setup_revisions(revision_args.nr, revision_args.v, &rev, &opt); if (argc > 1) goto usage; if (!rev.diffopt.output_format) { diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 0bb4648e36..daf96aa931 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -1741,4 +1741,8 @@ test_expect_success 'submodules does not affect the branch recorded in stash mes ) ' +test_expect_success SANITIZE_LEAK 'stash show handles -- without leaking' ' + git stash show -- +' + test_done |