X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-rebase.sh;h=0bf41ee72b79953dbb8fdab44e275c027174f5b7;hb=65a0a8e5facb42f41561a96af209016954878b63;hp=af7ba5fd90c3000892ed31893e1812514e4f3773;hpb=ce4d4e763c054788550625502553ced8810a7bce;p=thirdparty%2Fgit.git

diff --git a/git-rebase.sh b/git-rebase.sh
index af7ba5fd90..0bf41ee72b 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -176,7 +176,7 @@ You can run "git stash pop" or "git stash drop" at any time.
 
 finish_rebase () {
 	apply_autostash &&
-	git gc --auto &&
+	{ git gc --auto || true; } &&
 	rm -rf "$state_dir"
 }
 
@@ -248,6 +248,7 @@ do
 		;;
 	--exec=*)
 		cmd="${cmd}exec ${1#--exec=}${LF}"
+		test -z "$interactive_rebase" && interactive_rebase=implied
 		;;
 	--interactive)
 		interactive_rebase=explicit
@@ -348,12 +349,6 @@ do
 done
 test $# -gt 2 && usage
 
-if test -n "$cmd" &&
-   test "$interactive_rebase" != explicit
-then
-	die "$(gettext "The --exec option must be used with the --interactive option")"
-fi
-
 if test -n "$action"
 then
 	test -z "$in_progress" && die "$(gettext "No rebase in progress?")"