diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-29 00:25:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-29 00:25:44 -0700 |
| commit | 50335e8eeba0ea615566f3ea45091266d82fd9f0 (patch) | |
| tree | fcb8a296a738a61076ddefa0055ac9ac182b5344 | |
| parent | 67ff1a5a774c385c81038ea47ed18a9f5f6ff5a8 (diff) | |
| parent | a8a6e0682d1749b646aabbaad571ee5dc3634026 (diff) | |
Merge branch 'so/stash-staged' into next
"git stash" learned the "--staged" option to stash away what has
been added to the index (and nothing else).
* so/stash-staged:
stash: get rid of unused argument in stash_staged()
| -rw-r--r-- | builtin/stash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 8d6f0e582c..18c812bbe0 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -1132,8 +1132,8 @@ done: return ret; } -static int stash_staged(struct stash_info *info, const struct pathspec *ps, - struct strbuf *out_patch, int quiet) +static int stash_staged(struct stash_info *info, struct strbuf *out_patch, + int quiet) { int ret = 0; struct child_process cp_diff_tree = CHILD_PROCESS_INIT; @@ -1370,7 +1370,7 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b goto done; } } else if (only_staged) { - ret = stash_staged(info, ps, patch, quiet); + ret = stash_staged(info, patch, quiet); if (ret < 0) { if (!quiet) fprintf_ln(stderr, _("Cannot save the current " |