disallow providing multiple upstream branches to rebase, pull --rebase

It does not make sense to provide multiple upstream branches to either git pull --rebase, or to git rebase, so disallow both. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Feb 18, 2009 · 51b2ead · 51b2ead
1 parent b94ead7
commit 51b2ead
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/git-pull.sh b/git-pull.sh
@@ -171,6 +171,11 @@ case "$merge_head" in
 		echo >&2 "Cannot merge multiple branches into empty head"
 		exit 1
 	fi
+	if test true = "$rebase"
+	then
+		echo >&2 "Cannot rebase onto multiple branches"
+		exit 1
+	fi
 	;;
 esac
 

diff --git a/git-rebase.sh b/git-rebase.sh
@@ -310,6 +310,7 @@ do
 	esac
 	shift
 done
+test $# -gt 2 && usage
 
 # Make sure we do not have $GIT_DIR/rebase-apply
 if test -z "$do_merge"