worktree: fix worktree add race

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

diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh
index 8d6c9aca6584f76689246604abe047a85504671e..5c2c4e5276d17f257b255e85db112557d9d7fc61 100755 (executable)
--- a/git-legacy-rebase.sh
+++ b/git-legacy-rebase.sh
@@ -26,7 +26,6 @@ f,force-rebase!    cherry-pick all commits, even if unchanged
 m,merge!           use merging strategies to rebase
 i,interactive!     let the user edit the list of commits to rebase
 x,exec=!           add exec lines after each commit of the editable list
-y=!                same as --reschedule-failed-exec -x
 k,keep-empty      preserve empty commits during rebase
 allow-empty-message allow rebasing commits with empty messages
 stat!              display a diffstat of what changed upstream
@@ -261,11 +260,6 @@ do
                cmd="${cmd}exec ${1#--exec=}${LF}"
                test -z "$interactive_rebase" && interactive_rebase=implied
                ;;
-       -y*)
-               reschedule_failed_exec=--reschedule-failed-exec
-               cmd="${cmd}exec ${1#-y}${LF}"
-               test -z "$interactive_rebase" && interactive_rebase=implied
-               ;;
        --interactive)
                interactive_rebase=explicit
                ;;