diff options
author | Paul Tan <pyokagan@gmail.com> | 2015-06-06 19:46:10 +0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-08 13:09:20 -0700 |
commit | 20c3fe762105a29150fd21e3e0a340bca7890848 (patch) | |
tree | 5da24f7a7d0ff7968cacead9980301fc14f5da43 /test-config.c | |
parent | am --skip: support skipping while on unborn branch (diff) | |
download | tgif-20c3fe762105a29150fd21e3e0a340bca7890848.tar.xz |
am --abort: revert changes introduced by failed 3way merge
Even when a merge conflict occurs with am --3way, the index will be
modified with the results of any successfully merged files. These
changes to the index will not be reverted with a
"git read-tree --reset -u HEAD ORIG_HEAD", as git read-tree will not be
aware of how the current index differs from HEAD or ORIG_HEAD.
To fix this, we first reset any conflicting entries in the index. The
resulting index will contain the results of successfully merged files
introduced by the failed merge. We write this index to a tree, and then
use git read-tree to fast-forward this "index tree" back to ORIG_HEAD,
thus undoing all the changes from the failed merge.
When we are on an unborn branch, HEAD and ORIG_HEAD will not point to
valid trees. In this case, use an empty tree.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-config.c')
0 files changed, 0 insertions, 0 deletions