+#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
#include "config.h"
#include "parse-options.h"
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";
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;
assert_stash_ref(&info);
- ret = do_drop_stash(prefix, &info, quiet);
+ ret = do_drop_stash(&info, quiet);
free_stash_info(&info);
return ret;
}
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;
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);
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"),