mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-09-11 15:16:16 +03:00
Merge pull request #138 from mhagger/retain-more-authors
Retain author info whenever retaining commit message
This commit is contained in:
commit
002b8bd9df
18
git-imerge
18
git-imerge
@ -2863,7 +2863,11 @@ class MergeState(Block):
|
|||||||
self.git.get_log_message(orig).rstrip('\n')
|
self.git.get_log_message(orig).rstrip('\n')
|
||||||
+ '\n\n(rebased-with-history from commit %s)\n' % orig
|
+ '\n\n(rebased-with-history from commit %s)\n' % orig
|
||||||
)
|
)
|
||||||
commit = self.git.commit_tree(tree, [commit, orig], msg=msg)
|
commit = self.git.commit_tree(
|
||||||
|
tree, [commit, orig],
|
||||||
|
msg=msg,
|
||||||
|
metadata=self.git.get_author_info(orig),
|
||||||
|
)
|
||||||
|
|
||||||
self._set_refname(refname, commit, force=force)
|
self._set_refname(refname, commit, force=force)
|
||||||
|
|
||||||
@ -2909,7 +2913,11 @@ class MergeState(Block):
|
|||||||
+ '\n\n(rebased from commit %s)\n' % (orig,)
|
+ '\n\n(rebased from commit %s)\n' % (orig,)
|
||||||
)
|
)
|
||||||
|
|
||||||
commit = self.git.commit_tree(tree, parents, msg=msg)
|
commit = self.git.commit_tree(
|
||||||
|
tree, parents,
|
||||||
|
msg=msg,
|
||||||
|
metadata=self.git.get_author_info(orig),
|
||||||
|
)
|
||||||
commit1 = commit
|
commit1 = commit
|
||||||
|
|
||||||
i2 = self.len2 - 1
|
i2 = self.len2 - 1
|
||||||
@ -2932,7 +2940,11 @@ class MergeState(Block):
|
|||||||
+ '\n\n(rebased from commit %s)\n' % (orig,)
|
+ '\n\n(rebased from commit %s)\n' % (orig,)
|
||||||
)
|
)
|
||||||
|
|
||||||
commit = self.git.commit_tree(tree, parents, msg=msg)
|
commit = self.git.commit_tree(
|
||||||
|
tree, parents,
|
||||||
|
msg=msg,
|
||||||
|
metadata=self.git.get_author_info(orig),
|
||||||
|
)
|
||||||
commit2 = commit
|
commit2 = commit
|
||||||
|
|
||||||
# Construct the apex commit:
|
# Construct the apex commit:
|
||||||
|
@ -4,6 +4,9 @@ set -e
|
|||||||
|
|
||||||
DESCRIPTION="git-imerge test repository"
|
DESCRIPTION="git-imerge test repository"
|
||||||
|
|
||||||
|
# Sleep between commits to give commits distinct timestamps:
|
||||||
|
SLEEP="sleep 1"
|
||||||
|
|
||||||
modify() {
|
modify() {
|
||||||
filename="$1"
|
filename="$1"
|
||||||
text="$2"
|
text="$2"
|
||||||
@ -36,12 +39,14 @@ git config user.email 'luser@example.com'
|
|||||||
|
|
||||||
modify a.txt 0
|
modify a.txt 0
|
||||||
git commit -m 'm⇒0'
|
git commit -m 'm⇒0'
|
||||||
|
$SLEEP
|
||||||
|
|
||||||
git checkout -b a --
|
git checkout -b a --
|
||||||
for i in $(seq 8)
|
for i in $(seq 8)
|
||||||
do
|
do
|
||||||
modify a.txt $i
|
modify a.txt $i
|
||||||
git commit -m "a⇒$i"
|
git commit -m "a⇒$i"
|
||||||
|
$SLEEP
|
||||||
done
|
done
|
||||||
|
|
||||||
git checkout -b b master --
|
git checkout -b b master --
|
||||||
@ -49,6 +54,7 @@ for i in $(seq 5)
|
|||||||
do
|
do
|
||||||
modify b.txt $i
|
modify b.txt $i
|
||||||
git commit -m "b⇒$i"
|
git commit -m "b⇒$i"
|
||||||
|
$SLEEP
|
||||||
done
|
done
|
||||||
|
|
||||||
git checkout -b c master --
|
git checkout -b c master --
|
||||||
@ -56,13 +62,16 @@ for i in $(seq 3)
|
|||||||
do
|
do
|
||||||
modify c.txt $i
|
modify c.txt $i
|
||||||
git commit -m "c⇒$i"
|
git commit -m "c⇒$i"
|
||||||
|
$SLEEP
|
||||||
done
|
done
|
||||||
modify conflict.txt "c version"
|
modify conflict.txt "c version"
|
||||||
git commit -m "c conflict"
|
git commit -m "c conflict"
|
||||||
|
$SLEEP
|
||||||
for i in $(seq 4 8)
|
for i in $(seq 4 8)
|
||||||
do
|
do
|
||||||
modify c.txt $i
|
modify c.txt $i
|
||||||
git commit -m "c⇒$i"
|
git commit -m "c⇒$i"
|
||||||
|
$SLEEP
|
||||||
done
|
done
|
||||||
|
|
||||||
git checkout -b d master --
|
git checkout -b d master --
|
||||||
@ -70,6 +79,7 @@ for i in $(seq 2)
|
|||||||
do
|
do
|
||||||
modify d.txt $i
|
modify d.txt $i
|
||||||
git commit -m "d⇒$i"
|
git commit -m "d⇒$i"
|
||||||
|
$SLEEP
|
||||||
done
|
done
|
||||||
modify conflict.txt "d version"
|
modify conflict.txt "d version"
|
||||||
git commit -m "d conflict"
|
git commit -m "d conflict"
|
||||||
@ -77,6 +87,7 @@ for i in $(seq 3 5)
|
|||||||
do
|
do
|
||||||
modify d.txt $i
|
modify d.txt $i
|
||||||
git commit -m "d⇒$i"
|
git commit -m "d⇒$i"
|
||||||
|
$SLEEP
|
||||||
done
|
done
|
||||||
|
|
||||||
git checkout master --
|
git checkout master --
|
||||||
|
Loading…
Reference in New Issue
Block a user