create_autostash(): remove unneeded parameter

The default_reflog parameter of create_autostash() is passed to
reset_head(). However as creating a stash does not involve updating
any refs the parameter is not used by reset_head(). Removing the
parameter from create_autostash() simplifies the callers.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2022-01-26 13:05:44 +00:00 committed by Junio C Hamano
parent 1526d0fcfd
commit b7de153bd9
4 changed files with 9 additions and 13 deletions

View File

@ -1565,8 +1565,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (autostash) if (autostash)
create_autostash(the_repository, create_autostash(the_repository,
git_path_merge_autostash(the_repository), git_path_merge_autostash(the_repository));
"merge");
if (checkout_fast_forward(the_repository, if (checkout_fast_forward(the_repository,
&head_commit->object.oid, &head_commit->object.oid,
&commit->object.oid, &commit->object.oid,
@ -1637,8 +1636,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (autostash) if (autostash)
create_autostash(the_repository, create_autostash(the_repository,
git_path_merge_autostash(the_repository), git_path_merge_autostash(the_repository));
"merge");
/* We are going to make a new commit. */ /* We are going to make a new commit. */
git_committer_info(IDENT_STRICT); git_committer_info(IDENT_STRICT);

View File

@ -1657,10 +1657,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (repo_read_index(the_repository) < 0) if (repo_read_index(the_repository) < 0)
die(_("could not read index")); die(_("could not read index"));
if (options.autostash) { if (options.autostash)
create_autostash(the_repository, state_dir_path("autostash", &options), create_autostash(the_repository,
DEFAULT_REFLOG_ACTION); state_dir_path("autostash", &options));
}
if (require_clean_work_tree(the_repository, "rebase", if (require_clean_work_tree(the_repository, "rebase",
_("Please commit or stash them."), 1, 1)) { _("Please commit or stash them."), 1, 1)) {

View File

@ -4100,8 +4100,7 @@ static enum todo_command peek_command(struct todo_list *todo_list, int offset)
return -1; return -1;
} }
void create_autostash(struct repository *r, const char *path, void create_autostash(struct repository *r, const char *path)
const char *default_reflog_action)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct lock_file lock_file = LOCK_INIT; struct lock_file lock_file = LOCK_INIT;
@ -4138,7 +4137,7 @@ void create_autostash(struct repository *r, const char *path,
write_file(path, "%s", oid_to_hex(&oid)); write_file(path, "%s", oid_to_hex(&oid));
printf(_("Created autostash: %s\n"), buf.buf); printf(_("Created autostash: %s\n"), buf.buf);
if (reset_head(r, NULL, NULL, RESET_HEAD_HARD, NULL, NULL, if (reset_head(r, NULL, NULL, RESET_HEAD_HARD, NULL, NULL,
default_reflog_action) < 0) NULL) < 0)
die(_("could not reset --hard")); die(_("could not reset --hard"));
if (discard_index(r->index) < 0 || if (discard_index(r->index) < 0 ||

View File

@ -197,8 +197,7 @@ void commit_post_rewrite(struct repository *r,
const struct commit *current_head, const struct commit *current_head,
const struct object_id *new_head); const struct object_id *new_head);
void create_autostash(struct repository *r, const char *path, void create_autostash(struct repository *r, const char *path);
const char *default_reflog_action);
int save_autostash(const char *path); int save_autostash(const char *path);
int apply_autostash(const char *path); int apply_autostash(const char *path);
int apply_autostash_oid(const char *stash_oid); int apply_autostash_oid(const char *stash_oid);