[PATCH 5/5] checkout: "best effort" checkout
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 29, 2008, 00:17 UTC
- Message-ID
- <1212020246-26480-6-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1212020246-26480-5-git-send-email-gitster@pobox.com>
When unpack_trees() returned an error while switching branches, we used to stop right there, exiting without writing the index out or switching HEAD.
This is Ok when unpack_trees() detected a locally modified paths or untracked files that could be overwritten by branch switching, but it is undesirable if unpack_trees() already committed to update the work tree and a failure is returned because some but not all paths are updated (perhaps a directory that some files need to go in was made read-only by mistake, or a file that will be overwritten by branch switching had a mandatory lock on it and we could not unlink).
This changes the behaviour upon such an error to complete the branch switching; the files updated in the work tree will hopefully much more consistent with the index and HEAD derived from the switched-to branch.
We still issue error messages, and exit the command with non-zero status, so scripted callers need to notice it.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-checkout.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/builtin-checkout.c b/builtin-checkout.c index 9af5197..93ea69b 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -155,6 +155,7 @@ struct checkout_opts { int quiet; int merge; int force; + int writeout_error; char *new_branch; int new_branch_log; @@ -178,9 +179,20 @@ static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree) opts.dst_index = &the_index; parse_tree(tree); init_tree_desc(&tree_desc, tree->buffer, tree->size); - if (unpack_trees(1, &tree_desc, &opts)) + switch (unpack_trees(1, &tree_desc, &opts)) { + case -2: + o->writeout_error = 1; + /* + * We return 0 nevertheless, as the index is all right + * and more importantly we have made best efforts to + * update paths in the work tree, and we cannot revert + * them. + */ + case 0: + return 0; + default: return 128; - return 0; + } } struct branch_info { @@ -243,7 +255,8 @@ static int merge_working_tree(struct checkout_opts *opts, tree = parse_tree_indirect(new->commit->object.sha1); init_tree_desc(&trees[1], tree->buffer, tree->size); - if (unpack_trees(2, trees, &topts)) { + ret = unpack_trees(2, trees, &topts); + if (ret == -1) { /* * Unpack couldn't do a trivial merge; either * give up or do a real merge, depending on @@ -478,7 +491,8 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new) update_refs_for_switch(opts, &old, new); - return post_checkout_hook(old.commit, new->commit, 1); + ret = post_checkout_hook(old.commit, new->commit, 1); + return ret || opts->writeout_error; } int cmd_checkout(int argc, const char **argv, const char *prefix)
-- 1.5.6.rc0.43.g823ea