[PATCH v4 03/15] rebase -i: use "git sequencer--helper --make-patch"
From: Christian Couder <hidden>
Date: 2016-06-15 22:47:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
to simplify the "make_patch" function. Signed-off-by: Christian Couder <redacted> Signed-off-by: Junio C Hamano <redacted> --- git-rebase--interactive.sh | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 23ded48..c9c75c0 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -117,18 +117,7 @@ mark_action_done () { } make_patch () { - sha1_and_parents="$(git rev-list --parents -1 "$1")" - case "$sha1_and_parents" in - ?*' '?*' '?*) - git diff --cc $sha1_and_parents - ;; - ?*' '?*) - git diff-tree -p "$1^!" - ;; - *) - echo "Root commit" - ;; - esac > "$DOTEST"/patch + git sequencer--helper --make-patch "$1" test -f "$DOTEST"/message || git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message test -f "$DOTEST"/author-script ||
--
1.6.4.271.ge010d