kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'tb/stash-in-c-unused-param-fix' 

Code clean-up.

* tb/stash-in-c-unused-param-fix:
  stash: drop unused parameter
maint
Junio C Hamano 2019-04-22 11:14:44 +09:00
parent e36adf7122 eabf7405ab
commit 646becd773
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/stash.c
View File

@ -528,7 +528,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;
@ -598,7 +598,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;
} }
@ -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 " 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;
@ -664,7 +664,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);