зеркало из https://github.com/microsoft/git.git
rebase -m: do not trigger pre-commit verification
When rebasing changes that contain issues that the pre-commit hook flags
as problematic, the rebase cannot be continued. However, rebase is about
transplanting commits that are already made with as little distortion as
possible, and pre-commit check should not interfere.
Earlier, c5b09fe
(Avoid update hook during git-rebase --interactive,
2007-12-19) fixed "rebase -i", but "rebase -m" shared the same issue.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
6bf4f1b4c9
Коммит
e637122ef2
|
@ -63,7 +63,7 @@ continue_merge () {
|
|||
cmt=`cat "$dotest/current"`
|
||||
if ! git diff-index --quiet HEAD --
|
||||
then
|
||||
if ! git-commit -C "$cmt"
|
||||
if ! git commit --no-verify -C "$cmt"
|
||||
then
|
||||
echo "Commit failed, please do not call \"git commit\""
|
||||
echo "directly, but instead do one of the following: "
|
||||
|
|
Загрузка…
Ссылка в новой задаче