t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
Now that the sequencer creates commits without forking 'git commit' it does not see an empty commit in these tests which fixes the known breakage. Note that logic for handling KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 is not removed from lib-submodule-update.sh as it is still used by other tests. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Nov 24, 2017 at 11:07 UTC
db9476b50348c9d7e6a076cf4bd9ce0e70995439
2 files changed
-2
t/t3512-cherry-pick-submodule.sh
-1
@@ -5,7 +5,6 @@ test_description='cherry-pick can handle submodules'
5
. ./test-lib.sh
6
. "$TEST_DIRECTORY"/lib-submodule-update.sh
7
8
-KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
8
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
9
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
10
test_submodule_switch "git cherry-pick"
t/t3513-revert-submodule.sh
-1
@@ -25,7 +25,6 @@ git_revert () {
25
git revert HEAD
26
}
27
28
-KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
28
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
29
test_submodule_switch "git_revert"
30