code: plan9front

Download patch

ref: e938acc8ff64a3cbbd6ef7ba88f83e3f03ede681
parent: 00759994ca46451eba88037ebe1697461ea43437
author: Michael Forney <mforney@mforney.org>
date: Wed Sep 28 00:27:05 EDT 2022

git/rebase: remove unnecessary use of @ operator

Now that a..b handles the case where a isn't an ancestor of b, we
don't need to compute the LCA first.

--- a/sys/src/cmd/git/rebase
+++ b/sys/src/cmd/git/rebase
@@ -29,7 +29,7 @@
 	src=`{git/branch}
 	dst=`{git/query $1}
 	echo $src > .git/rebase.src
-	git/log -se $dst' '$src' @ .. '$src | sed 's/^/pick /' >.git/rebase.todo
+	git/log -se $dst'..'$src | sed 's/^/pick /' >.git/rebase.todo
 	if(! ~ $#interactive 0){
 		giteditor=`{git/conf core.editor}
 		if(~ $#editor 0)