Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2022-01-26 16:05:40 +0300
committerJunio C Hamano <gitster@pobox.com>2022-01-26 23:08:53 +0300
commit4840002a5f44a4c256c55f70c59d3b0506d14e21 (patch)
tree4dc007512d0fe02557d1dfccc94bcb0ea63a9163 /reset.c
parentab2fba0868860e610619f885031217d9cc63097a (diff)
rebase --apply: don't run post-checkout hook if there is an error
The hook should only be run if the worktree and refs were successfully updated. This primarily affects "rebase --apply" but also "rebase --merge" when it fast-forwards. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'reset.c')
-rw-r--r--reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/reset.c b/reset.c
index 3e7b9e2e13..3537de91f6 100644
--- a/reset.c
+++ b/reset.c
@@ -126,7 +126,7 @@ reset_head_refs:
ret = create_symref("HEAD", switch_to_branch,
reflog_head);
}
- if (run_hook)
+ if (!ret && run_hook)
run_hook_le(NULL, "post-checkout",
oid_to_hex(head ? head : null_oid()),
oid_to_hex(oid), "1", NULL);