diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-01-26 13:05:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-01-26 12:08:53 -0800 |
| commit | 1946d45844c65ede4e3a514a5decf16612ad79f0 (patch) | |
| tree | 17bdb2a138c5024bb8e3d3256dd357555232bd3c /.gitattributes | |
| parent | rebase --apply: don't run post-checkout hook if there is an error (diff) | |
| download | tgif-1946d45844c65ede4e3a514a5decf16612ad79f0.tar.xz | |
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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions