refs: rename struct ref_cache to files_ref_store

[thirdparty/git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index cf60c4390870ef28cff08b6a173a435d41e2d470..0bf41ee72b79953dbb8fdab44e275c027174f5b7 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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?")"