X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase--interactive.sh;h=c6ba7c15510935353bd17b2b8d8188fe16052907;hb=e65ceb61cd7d3fabedea8cb545f8c210b48552d4;hp=65690af89307abd72749123caddce9e6c4692383;hpb=15af7075fc21877320a3fcf251201b209af5253a;p=git.git

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 65690af89..c6ba7c155 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -713,7 +713,6 @@ then
 	# parents to rewrite and skipping dropped commits would
 	# prematurely end our probe
 	merges_option=
-	first_after_upstream="$(git rev-list --reverse --first-parent $upstream..$orig_head | head -n 1)"
 else
 	merges_option="--no-merges --cherry-pick"
 fi
@@ -746,7 +745,7 @@ do
 			preserve=t
 			for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
 			do
-				if test -f "$rewritten"/$p -a \( $p != $onto -o $sha1 = $first_after_upstream \)
+				if test -f "$rewritten"/$p
 				then
 					preserve=f
 				fi