mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-21 04:28:11 +03:00
Code Issues Projects Releases Wiki Activity

Teach "remove" how to abort a merge conflict.

Browse Source
This commit is contained in:
Michael Haggerty 2013-05-05 16:30:08 +02:00
parent c9cee43666
commit ee8dab4004
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
git-imerge
View File

@ -1532,11 +1532,33 @@ class MergeState(Block):
@staticmethod
def remove(name):
# If this merge is the default, unset the default:
if MergeState.get_default_name() == name:
MergeState.set_default_name(None)
# If HEAD is the scratch refname, abort any in-progress
# commits and detach HEAD:
scratch_refname = MergeState.get_scratch_refname(name)
try:
head_refname = check_output(['git', 'symbolic-ref', '--quiet', 'HEAD']).strip()
except CalledProcessError:
head_refname = None
if head_refname == scratch_refname:
try:
check_call(['git', 'merge', '--abort'])
except CalledProcessError:
pass
# Detach head so that we can delete scratch_refname:
check_call([
'git', 'update-ref', '--no-deref',
'-m', 'Detach HEAD from %s' % (scratch_refname,),
'HEAD', get_commit_sha1('HEAD'),
])
# Remove any references associated with this merge:
# Delete the scratch refname:
check_call([
'git', 'update-ref',
'-m', 'imerge %s: remove scratch reference' % (name,),
'-d', scratch_refname,
])
# Remove any references referring to intermediate merges:
for line in check_output([
'git', 'for-each-ref', 'refs/imerge/%s' % (name,)
]).splitlines():
@ -1552,6 +1574,10 @@ class MergeState(Block):
'Warning: error removing reference %r: %s' % (refname, e)
)
# If this merge was the default, unset the default:
if MergeState.get_default_name() == name:
MergeState.set_default_name(None)
def __init__(self, name, goal, merge_base, commits1, commits2, source):
Block.__init__(self, len(commits1) + 1, len(commits2) + 1)
self.name = name
@ -2225,7 +2251,6 @@ def main(args):
else:
sys.stderr.write('Merge is complete!\n')
elif options.subcommand == 'remove':
require_clean_work_tree('proceed')
MergeState.remove(choose_merge_name(options.name, default_to_unique=False))
elif options.subcommand == 'continue':
require_clean_work_tree('proceed')