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

Code clean-up.

* tb/stash-in-c-unused-param-fix:
stash: drop unused parameter

diff --combined builtin/stash.c
index 51df0926331907dcc0cb91341d4bf2e97502c599,da946e76839620ef9869945c34bc5008424842a4..4ea95060adc11823c8ec797387dc112be218694a
--- 1/builtin/stash.c
--- 2/builtin/stash.c
+++ b/builtin/stash.c
@@@ -1,4 -1,3 +1,4 @@@
 +#define USE_THE_INDEX_COMPATIBILITY_MACROS
  #include "builtin.h"
  #include "config.h"
  #include "parse-options.h"
@@@ -433,7 -432,7 +433,7 @@@ static int do_apply_stash(const char *p
        if (info->has_u && restore_untracked(&info->u_tree))
                return error(_("could not restore untracked files from stash"));
  
 -      init_merge_options(&o);
 +      init_merge_options(&o, the_repository);
  
        o.branch1 = "Updated upstream";
        o.branch2 = "Stashed changes";
@@@ -528,7 -527,7 +528,7 @@@ static int apply_stash(int argc, const 
        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 -597,7 +598,7 @@@ static int drop_stash(int argc, const c
  
        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 -626,7 +627,7 @@@ static int pop_stash(int argc, const ch
                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 -663,7 +664,7 @@@ static int branch_stash(int argc, cons
        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);
  
@@@ -815,8 -814,7 +815,8 @@@ static int store_stash(int argc, const 
                return -1;
        }
  
 -      if (get_oid_with_context(argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
 +      if (get_oid_with_context(the_repository,
 +                               argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
                                 &dummy)) {
                if (!quiet)
                        fprintf_ln(stderr, _("Cannot update %s with %s"),