[PATCH 1/2] entry.c: submodule recursing: respect force flag correctly
- From
Stefan Beller <sbeller@google.com>
- Date
- Mar 29, 2017, 18:37 UTC
- Message-ID
- <20170329183743.27506-1-sbeller@google.com>
In case of a non-forced worktree update, the submodule movement is tested in a dry run first, such that it doesn't matter if the actual update is done via the force flag. However for correctness, we want to give the flag is specified by the user.
Signed-off-by: Stefan Beller <sbeller@google.com> --- entry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entry.c b/entry.c index d2b512da90..645121f828 100644 --- a/entry.c +++ b/entry.c @@ -287,7 +287,7 @@ int checkout_entry(struct cache_entry *ce, } else return submodule_move_head(ce->name, "HEAD", oid_to_hex(&ce->oid), - SUBMODULE_MOVE_HEAD_FORCE); + state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0); } if (!changed)
-- 2.12.0.rc1.52.g2de7d24de9.dirty