diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-25 08:30:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 01:10:10 (GMT) |
| commit | cfc5789ada444423232fa1533f401b5972eb3f6c (patch) | |
| tree | 8a2ecdd8e946c0766d276d69b0d0693dffa1837a /builtin-checkout.c | |
| parent | be6ff8196d9890c1875a75b96320b863dd1fe815 (diff) | |
| download | git-cfc5789ada444423232fa1533f401b5972eb3f6c.zip git-cfc5789ada444423232fa1533f401b5972eb3f6c.tar.gz git-cfc5789ada444423232fa1533f401b5972eb3f6c.tar.bz2 | |
resolve-undo: record resolved conflicts in a new index extension section
When resolving a conflict using "git add" to create a stage #0 entry, or
"git rm" to remove entries at higher stages, remove_index_entry_at()
function is eventually called to remove unmerged (i.e. higher stage)
entries from the index. Introduce a "resolve_undo_info" structure and
keep track of the removed cache entries, and save it in a new index
extension section in the index_state.
Operations like "read-tree -m", "merge", "checkout [-m] <branch>" and
"reset" are signs that recorded information in the index is no longer
necessary. The data is removed from the index extension when operations
start; they may leave conflicted entries in the index, and later user
actions like "git add" will record their conflicted states afresh.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 64f3a11..a0fe7a4 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -17,6 +17,7 @@ #include "blob.h" #include "xdiff-interface.h" #include "ll-merge.h" +#include "resolve-undo.h" static const char * const checkout_usage[] = { "git checkout [options] <branch>", @@ -370,6 +371,7 @@ static int merge_working_tree(struct checkout_opts *opts, if (read_cache_preload(NULL) < 0) return error("corrupt index file"); + resolve_undo_clear(); if (opts->force) { ret = reset_tree(new->commit->tree, opts, 1); if (ret) |