diff options
| author | Stefan Beller <sbeller@google.com> | 2017-07-24 10:36:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-25 11:05:41 -0700 |
| commit | 3ef253803211f5ec38c88635bfd50f91ccd98e16 (patch) | |
| tree | 34d3aecdbf83da253edb939141836edc1c316622 /submodule.c | |
| parent | 5800c63717ae35286a1441f14ffff753e01f7e2b (diff) | |
| download | git-3ef253803211f5ec38c88635bfd50f91ccd98e16.tar.gz git-3ef253803211f5ec38c88635bfd50f91ccd98e16.tar.xz | |
recursive submodules: detach HEAD from new state
When a submodule is on a branch and in its superproject you run a
recursive checkout, the branch of the submodule is updated to what the
superproject checks out. This is very unexpected in the current model of
Git as e.g. 'submodule update' always detaches the submodule HEAD.
Despite having plans to have submodule HEADS not detached in the future,
the current behavior is really bad as it doesn't match user expectations
and it is not checking for loss of commits (only to be recovered via the
reflog).
Detach the HEAD unconditionally in the submodule when updating it.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 6531c5d60..37f4a9287 100644 --- a/submodule.c +++ b/submodule.c @@ -1641,7 +1641,8 @@ int submodule_move_head(const char *path, cp.dir = path; prepare_submodule_repo_env(&cp.env_array); - argv_array_pushl(&cp.args, "update-ref", "HEAD", new, NULL); + argv_array_pushl(&cp.args, "update-ref", "HEAD", + "--no-deref", new, NULL); if (run_command(&cp)) { ret = -1; |