diff options
| author | Stefan Beller <sbeller@google.com> | 2018-01-05 20:03:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-05 20:35:35 (GMT) |
| commit | 7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467 (patch) | |
| tree | 34cf3bc69af82512426e5b7322d2ed6d87d33f18 /submodule.c | |
| parent | ad17312e1170715a15651b3185dae9ebc6b6b8ef (diff) | |
| download | git-7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467.zip git-7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467.tar.gz git-7dcc1f4df8c74ec43d9b3e8c97aa985c2663b467.tar.bz2 | |
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>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 2967704..47ddc9b 100644 --- a/submodule.c +++ b/submodule.c @@ -1657,7 +1657,9 @@ int submodule_move_head(const char *path, else argv_array_push(&cp.args, "-m"); - argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX); + if (!(flags & SUBMODULE_MOVE_HEAD_FORCE)) + argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX); + argv_array_push(&cp.args, new ? new : EMPTY_TREE_SHA1_HEX); if (run_command(&cp)) { |