Thomas Gummerer <[email protected]> writes: > Agreed, I'd be happy to keep the parameter there. Looking at your > fork, you seem to have some WIP patches to introduce a UNUSED macro > for parameters like this, which I don't think I've seen on the list > yet (though I may have just missed them). > > I guess it's probably best for you to mark this parameter as UNUSED as > part of your series, but if you have a different preference on how to > handle it, let me know.
I agree that the uniformity among near-toplevel helpers like create_stash() is a good thing to have. In the meantime, you want the patch you sent (below) on top of the stash-in-c topic to address do_drop_stash()? Thanks for working well together. > --- >8 --- > Subject: [PATCH 2/2] 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 <[email protected]> > Signed-off-by: Thomas Gummerer <[email protected]> > --- > builtin/stash.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/builtin/stash.c b/builtin/stash.c > index 6eb67c75c3..069bf14846 100644 > --- a/builtin/stash.c > +++ b/builtin/stash.c > @@ -527,7 +527,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; > @@ -597,7 +597,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; > } > @@ -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 " > "you need it again.")); > else > - ret = do_drop_stash(prefix, &info, quiet); > + ret = do_drop_stash(&info, quiet); > > free_stash_info(&info); > return ret; > @@ -663,7 +663,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);
