Skip to content

Commit 646becd

Browse files
committed
Merge branch 'tb/stash-in-c-unused-param-fix'
Code clean-up. * tb/stash-in-c-unused-param-fix: stash: drop unused parameter
2 parents e36adf7 + eabf740 commit 646becd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

builtin/stash.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ static int apply_stash(int argc, const char **argv, const char *prefix)
528528
return ret;
529529
}
530530

531-
static int do_drop_stash(const char *prefix, struct stash_info *info, int quiet)
531+
static int do_drop_stash(struct stash_info *info, int quiet)
532532
{
533533
int ret;
534534
struct child_process cp_reflog = CHILD_PROCESS_INIT;
@@ -598,7 +598,7 @@ static int drop_stash(int argc, const char **argv, const char *prefix)
598598

599599
assert_stash_ref(&info);
600600

601-
ret = do_drop_stash(prefix, &info, quiet);
601+
ret = do_drop_stash(&info, quiet);
602602
free_stash_info(&info);
603603
return ret;
604604
}
@@ -627,7 +627,7 @@ static int pop_stash(int argc, const char **argv, const char *prefix)
627627
printf_ln(_("The stash entry is kept in case "
628628
"you need it again."));
629629
else
630-
ret = do_drop_stash(prefix, &info, quiet);
630+
ret = do_drop_stash(&info, quiet);
631631

632632
free_stash_info(&info);
633633
return ret;
@@ -664,7 +664,7 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
664664
if (!ret)
665665
ret = do_apply_stash(prefix, &info, 1, 0);
666666
if (!ret && info.is_stash_ref)
667-
ret = do_drop_stash(prefix, &info, 0);
667+
ret = do_drop_stash(&info, 0);
668668

669669
free_stash_info(&info);
670670

0 commit comments

Comments
 (0)