submodule: submodule_move_head omits old argument in forced case
When using hard reset or forced checkout with the option to recurse into submodules, the submodules need to be reset, too. It turns out that we need to omit the duplicate old argument to read-tree in all forced cases to omit the 2 way merge and use the more assertive behavior of reading the specific new tree into the index and updating the working tree. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jan 5, 2018 at 12:03 UTC
7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467
2 files changed
+17
-1
submodule.c
+3
-1
@@ -1657,7 +1657,9 @@ int submodule_move_head(const char *path,
1657
else
1658
argv_array_push(&cp.args, "-m");
1659
1660
- argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX);
1660
+ if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
1661
+ argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX);
1662
+
1663
argv_array_push(&cp.args, new ? new : EMPTY_TREE_SHA1_HEX);
1664
1665
if (run_command(&cp)) {
t/lib-submodule-update.sh
+14
@@ -1015,4 +1015,18 @@ test_submodule_forced_switch_recursing_with_args () {
1015
test_submodule_content sub1 origin/modify_sub1
1016
)
1017
'
1018
+
1019
+ test_expect_success "$command: changed submodule worktree is reset" '
1020
+ prolog &&
1021
+ reset_work_tree_to_interested add_sub1 &&
1022
+ (
1023
+ cd submodule_update &&
1024
+ rm sub1/file1 &&
1025
+ : >sub1/new_file &&
1026
+ git -C sub1 add new_file &&
1027
+ $command HEAD &&
1028
+ test_path_is_file sub1/file1 &&
1029
+ test_path_is_missing sub1/new_file
1030
+ )
1031
+ '
1032
}