diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:15 (GMT) |
| commit | 0f57f731ea2a540a4c82b476054e8a36aebb2314 (patch) | |
| tree | 7d71894a78d4b3acd828861c2c15e314ee18a0a4 /t/t3512-cherry-pick-submodule.sh | |
| parent | dd0c256b67d1b128655c42ae126fa3397b1f9ede (diff) | |
| parent | 66618a50f9c9f008d7aef751418f12ba9bfc6b85 (diff) | |
| download | git-0f57f731ea2a540a4c82b476054e8a36aebb2314.zip git-0f57f731ea2a540a4c82b476054e8a36aebb2314.tar.gz git-0f57f731ea2a540a4c82b476054e8a36aebb2314.tar.bz2 | |
Merge branch 'pw/sequencer-in-process-commit'
The sequencer infrastructure is shared across "git cherry-pick",
"git rebase -i", etc., and has always spawned "git commit" when it
needs to create a commit. It has been taught to do so internally,
when able, by reusing the codepath "git commit" itself uses, which
gives performance boost for a few tens of percents in some sample
scenarios.
* pw/sequencer-in-process-commit:
sequencer: run 'prepare-commit-msg' hook
t7505: add tests for cherry-pick and rebase -i/-p
t7505: style fixes
sequencer: assign only free()able strings to gpg_sign
sequencer: improve config handling
t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
sequencer: try to commit without forking 'git commit'
sequencer: load commit related config
sequencer: simplify adding Signed-off-by: trailer
commit: move print_commit_summary() to libgit
commit: move post-rewrite code to libgit
Add a function to update HEAD after creating a commit
commit: move empty message checks to libgit
t3404: check intermediate squash messages
Diffstat (limited to 't/t3512-cherry-pick-submodule.sh')
| -rwxr-xr-x | t/t3512-cherry-pick-submodule.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh index ce48c4f..bd78287 100755 --- a/t/t3512-cherry-pick-submodule.sh +++ b/t/t3512-cherry-pick-submodule.sh @@ -5,7 +5,6 @@ test_description='cherry-pick can handle submodules' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-submodule-update.sh -KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 test_submodule_switch "git cherry-pick" |