stash: drop unused parameter
Drop the unused prefix parameter in do_drop_stash. We also have an unused "prefix" parameter in the 'create_stash' function, however we leave that in place for symmetry with the other top-level functions. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7906af0cb8
commit
eabf7405ab
@ -527,7 +527,7 @@ static int apply_stash(int argc, const char **argv, const char *prefix)
|
|||||||
return ret;
|
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;
|
int ret;
|
||||||
struct child_process cp_reflog = CHILD_PROCESS_INIT;
|
struct child_process cp_reflog = CHILD_PROCESS_INIT;
|
||||||
@ -597,7 +597,7 @@ static int drop_stash(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
assert_stash_ref(&info);
|
assert_stash_ref(&info);
|
||||||
|
|
||||||
ret = do_drop_stash(prefix, &info, quiet);
|
ret = do_drop_stash(&info, quiet);
|
||||||
free_stash_info(&info);
|
free_stash_info(&info);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -626,7 +626,7 @@ static int pop_stash(int argc, const char **argv, const char *prefix)
|
|||||||
printf_ln(_("The stash entry is kept in case "
|
printf_ln(_("The stash entry is kept in case "
|
||||||
"you need it again."));
|
"you need it again."));
|
||||||
else
|
else
|
||||||
ret = do_drop_stash(prefix, &info, quiet);
|
ret = do_drop_stash(&info, quiet);
|
||||||
|
|
||||||
free_stash_info(&info);
|
free_stash_info(&info);
|
||||||
return ret;
|
return ret;
|
||||||
@ -663,7 +663,7 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
|
|||||||
if (!ret)
|
if (!ret)
|
||||||
ret = do_apply_stash(prefix, &info, 1, 0);
|
ret = do_apply_stash(prefix, &info, 1, 0);
|
||||||
if (!ret && info.is_stash_ref)
|
if (!ret && info.is_stash_ref)
|
||||||
ret = do_drop_stash(prefix, &info, 0);
|
ret = do_drop_stash(&info, 0);
|
||||||
|
|
||||||
free_stash_info(&info);
|
free_stash_info(&info);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user