diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-12-26 00:40:02 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 04:10:10 +0300 |
commit | 8aa38563b22c84b06ea1fff9638cc1f44fda726f (patch) | |
tree | 3631ade1815f7d590ba6e4af48559ed2aab5e382 /rerere.c | |
parent | 4421a8235783d0664faa9a1d45be114fd7ad8206 (diff) |
resolve-undo: teach "update-index --unresolve" to use resolve-undo info
The update-index plumbing command had a hacky --unresolve implementation
that was written back in the days when merge was the only way for users to
end up with higher stages in the index, and assumed that stage #2 must
have come from HEAD, stage #3 from MERGE_HEAD and didn't bother to compute
the stage #1 information.
There were several issues with this approach:
- These days, merge is not the only command, and conflicts coming from
commands like cherry-pick, "am -3", etc. cannot be recreated by looking
at MERGE_HEAD;
- For a conflict that came from a merge that had renames, picking up the
same path from MERGE_HEAD and HEAD wouldn't help recreating it, either;
- It may have been Ok not to recreate stage #1 back when it was written,
because "diff --ours/--theirs" were the only availble ways to review
conflicts and they don't need stage #1 information. "diff --cc" that
was invented much later is a lot more useful way but it needs stage #1.
We can use resolve-undo information recorded in the index extension to
solve all of these issues.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions