diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-01-26 13:05:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-26 20:08:53 (GMT) |
| commit | 1946d45844c65ede4e3a514a5decf16612ad79f0 (patch) | |
| tree | 17bdb2a138c5024bb8e3d3256dd357555232bd3c /sequencer.c | |
| parent | 4840002a5f44a4c256c55f70c59d3b0506d14e21 (diff) | |
| download | git-1946d45844c65ede4e3a514a5decf16612ad79f0.zip git-1946d45844c65ede4e3a514a5decf16612ad79f0.tar.gz git-1946d45844c65ede4e3a514a5decf16612ad79f0.tar.bz2 | |
reset_head(): remove action parameter
The only use of the action parameter is to setup the error messages
for unpack_trees(). All but two cases pass either "checkout" or
"reset". The case that passes "reset --hard" would be better passing
"reset" so that the error messages match the builtin reset command
like all the other callers that are doing a reset. The case that
passes "Fast-forwarded" is only updating HEAD and so the parameter is
unused in that case as it does not call unpack_trees(). The value to
pass to setup_unpack_trees_porcelain() can be determined by checking
whether flags contains RESET_HEAD_HARD without the caller having to
specify it.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index b4135a7..e18329a 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4137,8 +4137,7 @@ void create_autostash(struct repository *r, const char *path, path); write_file(path, "%s", oid_to_hex(&oid)); printf(_("Created autostash: %s\n"), buf.buf); - if (reset_head(r, NULL, "reset --hard", - NULL, RESET_HEAD_HARD, NULL, NULL, + if (reset_head(r, NULL, NULL, RESET_HEAD_HARD, NULL, NULL, default_reflog_action) < 0) die(_("could not reset --hard")); |