Re: [PATCH 1/8] Use %B for Split Subject/Body
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/8] Use %B for Split Subject/Body · 郑文辉 (Techlive Zheng) <hidden>
- 2016-06-15 · Re: [PATCH 1/8] Use %B for Split Subject/Body · 郑文辉 (Techlive Zheng) <hidden>
- 2016-06-15 · Re: [PATCH 1/8] Use %B for Split Subject/Body · <hidden>
- 2016-06-15 · Re: [PATCH 1/8] Use %B for Split Subject/Body · <hidden>
- 2016-06-15 · Re: [PATCH 1/8] Use %B for Split Subject/Body · <hidden>
"郑文辉(Techlive Zheng)" [off-list ref] writes:
Though, this patch defintely should be merged, becuase no one expects his commit message be altered durging the splitting process.
Are you saying that after double-checking what was posted? It said something like this below, which does not look like 'definitely should be' to me.
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 920c664..f2b6d4a 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh@@ -296,7 +296,12 @@ copy_commit() # We're going to set some environment vars here, so # do it in a subshell to get rid of them safely later debug copy_commit "{$1}" "{$2}" "{$3}" + # Use %B rather than %s%n%n%b to handle the special case of a + # commit that only has a subject line. We don't want to + # introduce a newline after the subject, causing generation of + # a new hash. git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%s%n%n%b' "$1" | +# git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%B' "$1" | ( read GIT_AUTHOR_NAME read GIT_AUTHOR_EMAIL