Skip to content

Don't add 'rebased-with-history from <commit>' if IMERGE_MODIFY_COMMI… #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't add 'rebased-with-history from <commit>' if IMERGE_MODIFY_COMMI… #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions git-imerge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2831,6 +2831,15 @@ class MergeState(Block):
)
self.git.checkout(refname, quiet=True)

def get_modified_log_message(self, orig, kind):
msg = self.git.get_log_message(orig)
if os.environ.get('IMERGE_MODIFY_COMMIT_MSG','1') != '0':
Copy link
Author

@brucehoult brucehoult Oct 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No point to cache/optimise this as the subsequent git operation is far more heavyweight.

msg = (
msg.rstrip('\n')
+ '\n\n(%s from commit %s)\n' % (kind,orig)
)
return msg

def simplify_to_full(self, refname, force=False):
for i1 in range(1, self.len1):
for i2 in range(1, self.len2):
Expand Down Expand Up @@ -2859,10 +2868,7 @@ class MergeState(Block):
tree = self.git.get_tree(self[i1, i2].sha1)

# Create a commit, copying the old log message:
msg = (
self.git.get_log_message(orig).rstrip('\n')
+ '\n\n(rebased-with-history from commit %s)\n' % orig
)
msg = self.get_modified_log_message(orig, 'rebased-with-history')
commit = self.git.commit_tree(tree, [commit, orig], msg=msg)

self._set_refname(refname, commit, force=force)
Expand Down Expand Up @@ -2898,16 +2904,10 @@ class MergeState(Block):
# Create a commit, copying the old log message:
if with_history2:
parents = [commit, orig]
msg = (
self.git.get_log_message(orig).rstrip('\n')
+ '\n\n(rebased-with-history from commit %s)\n' % (orig,)
)
msg = self.get_modified_log_message(orig, 'rebased-with-history')
else:
parents = [commit]
msg = (
self.git.get_log_message(orig).rstrip('\n')
+ '\n\n(rebased from commit %s)\n' % (orig,)
)
msg = self.get_modified_log_message(orig, 'rebased')

commit = self.git.commit_tree(tree, parents, msg=msg)
commit1 = commit
Expand All @@ -2921,16 +2921,10 @@ class MergeState(Block):
# Create a commit, copying the old log message:
if with_history1:
parents = [orig, commit]
msg = (
self.git.get_log_message(orig).rstrip('\n')
+ '\n\n(rebased-with-history from commit %s)\n' % (orig,)
)
msg = self.get_modified_log_message(orig, 'rebased-with-history')
else:
parents = [commit]
msg = (
self.git.get_log_message(orig).rstrip('\n')
+ '\n\n(rebased from commit %s)\n' % (orig,)
)
msg = self.get_modified_log_message(orig, 'rebased')

commit = self.git.commit_tree(tree, parents, msg=msg)
commit2 = commit
Expand Down