From f3d5e463f06c34716a9ce9d946e689377e9fda37 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 9 Oct 2007 13:59:43 +0100 Subject: [PATCH] rebase -i: use diff plumbing instead of porcelain When diff drivers are installed, calling "git diff .." calls those drivers. This borks the patch generation of rebase -i. So use "git diff-tree -p" instead, which does not call diff drivers. Noticed by Johannes Sixt. Signed-off-by: Johannes Schindelin Signed-off-by: Lars Hjemli Signed-off-by: Shawn O. Pearce --- git-rebase--interactive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 653393d8c..50b79ff8f 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -78,7 +78,7 @@ mark_action_done () { make_patch () { parent_sha1=$(git rev-parse --verify "$1"^ 2> /dev/null) - git diff "$parent_sha1".."$1" > "$DOTEST"/patch + git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch } die_with_patch () { @@ -302,7 +302,7 @@ do_next () { git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD && git symbolic-ref HEAD $HEADNAME && { test ! -f "$DOTEST"/verbose || - git diff --stat $(cat "$DOTEST"/head)..HEAD + git diff-tree --stat $(cat "$DOTEST"/head)..HEAD } && rm -rf "$DOTEST" && warn "Successfully rebased and updated $HEADNAME." -- 2.30.2