path: root/
diff options
authorPaul Tan <>2015-06-06 11:46:10 (GMT)
committerJunio C Hamano <>2015-06-08 20:09:20 (GMT)
commit20c3fe762105a29150fd21e3e0a340bca7890848 (patch)
tree5da24f7a7d0ff7968cacead9980301fc14f5da43 /
parentf8da6801e2fb3e46a42031b860c6411ef76a0335 (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 5 insertions, 1 deletions
diff --git a/ b/
index e0d067c..f71d7bb 100755
--- a/
+++ b/
@@ -509,7 +509,11 @@ then
git rerere clear
if safe_to_abort
- git read-tree --reset -u HEAD ORIG_HEAD
+ head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree) &&
+ git read-tree --reset -u $head_tree $head_tree &&
+ index_tree=$(git write-tree) &&
+ orig_head=$(git rev-parse --verify -q ORIG_HEAD || echo $empty_tree) &&
+ git read-tree -m -u $index_tree $orig_head
git reset ORIG_HEAD
rm -fr "$dotest"