summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c65bf12)
raw | patch | inline | side by side (parent: c65bf12)
author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
Tue, 28 Dec 2010 09:30:28 +0000 (10:30 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 28 Dec 2010 23:04:45 +0000 (15:04 -0800) |
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>
git-rebase.sh.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh | patch | blob | history |
index 4d3dc63605e3f3a3d832f60db3a6156a1eb73197..21a97743872504a5b77375f10edb75bebeabe8ce 100755 (executable)
get_saved_options
comment_for_reflog continue
- test -d "$DOTEST" || die "No interactive rebase running"
-
# Sanity check
git rev-parse --verify HEAD >/dev/null ||
die "Cannot read HEAD"
comment_for_reflog abort
git rerere clear
- test -d "$DOTEST" || die "No interactive rebase running"
HEADNAME=$(cat "$DOTEST"/head-name)
HEAD=$(cat "$DOTEST"/head)
comment_for_reflog skip
git rerere clear
- test -d "$DOTEST" || die "No interactive rebase running"
output git reset --hard && do_rest
;;
test -z "$rebase_root" -a $# -ge 1 -a $# -le 2 ||
test ! -z "$rebase_root" -a $# -le 1 || usage
-test -d "$DOTEST" &&
- die "Interactive rebase already started"
git var GIT_COMMITTER_IDENT >/dev/null ||
die "You need to set your committer info first"