diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-22 05:14:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 05:14:44 +0300 |
| commit | 646becd77344b3115f5b0d464af70cd1978e15ec (patch) | |
| tree | 3e8b50a049aa49e764864970779e9b33e94e0705 /builtin | |
| parent | e36adf712251a19bd2ada0016764d340dfcf2ba0 (diff) | |
| parent | eabf7405ab302ea6f590de739e9458405a8fa7dc (diff) | |
Merge branch 'tb/stash-in-c-unused-param-fix'
Code clean-up.
* tb/stash-in-c-unused-param-fix:
stash: drop unused parameter
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/stash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 51df092633..4ea95060ad 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -528,7 +528,7 @@ static int apply_stash(int argc, const char **argv, const char *prefix) return ret; } -static int do_drop_stash(const char *prefix, struct stash_info *info, int quiet) +static int do_drop_stash(struct stash_info *info, int quiet) { int ret; struct child_process cp_reflog = CHILD_PROCESS_INIT; @@ -598,7 +598,7 @@ static int drop_stash(int argc, const char **argv, const char *prefix) assert_stash_ref(&info); - ret = do_drop_stash(prefix, &info, quiet); + ret = do_drop_stash(&info, quiet); free_stash_info(&info); return ret; } @@ -627,7 +627,7 @@ static int pop_stash(int argc, const char **argv, const char *prefix) printf_ln(_("The stash entry is kept in case " "you need it again.")); else - ret = do_drop_stash(prefix, &info, quiet); + ret = do_drop_stash(&info, quiet); free_stash_info(&info); return ret; @@ -664,7 +664,7 @@ static int branch_stash(int argc, const char **argv, const char *prefix) if (!ret) ret = do_apply_stash(prefix, &info, 1, 0); if (!ret && info.is_stash_ref) - ret = do_drop_stash(prefix, &info, 0); + ret = do_drop_stash(&info, 0); free_stash_info(&info); |