@matheusbsbs / matheus-bagliano / commits / f3889b8401
Fork 0

rebase -i: remove now unnecessary directory checks

Remove directory checks from git-rebase--interactive.sh that are done in git-rebase.sh. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Martin von Zweigbergk committed Feb 6, 2011 at 13:43 UTC f3889b84010f16558421fd45cb3d0062f9d6e024
1 file changed -6
git-rebase--interactive.sh
-6
@@ -706,8 +706,6 @@ continue)
706 get_saved_options
707 comment_for_reflog continue
708
709 - test -d "$dotest" || die "No interactive rebase running"
710 -
709 # Sanity check
710 git rev-parse --verify HEAD >/dev/null ||
711 die "Cannot read HEAD"
@@ -749,7 +747,6 @@ abort)
747 comment_for_reflog abort
748
749 git rerere clear
752 - test -d "$dotest" || die "No interactive rebase running"
750
751 headname=$(cat "$dotest"/head-name)
752 head=$(cat "$dotest"/head)
@@ -767,7 +764,6 @@ skip)
764 comment_for_reflog skip
765
766 git rerere clear
770 - test -d "$dotest" || die "No interactive rebase running"
767
768 output git reset --hard && do_rest
769 ;;
@@ -780,8 +776,6 @@ fi
776
777 test -z "$rebase_root" -a $# -ge 1 -a $# -le 2 ||
778 test ! -z "$rebase_root" -a $# -le 1 || usage
783 -test -d "$dotest" &&
784 - die "Interactive rebase already started"
779
780 git var GIT_COMMITTER_IDENT >/dev/null ||
781 die "You need to set your committer info first"