summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf432ca)
raw | patch | inline | side by side (parent: cf432ca)
author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
Sun, 6 Feb 2011 18:43:40 +0000 (13:43 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 10 Feb 2011 22:08:08 +0000 (14:08 -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 9c43c601708112b412d6f47443e875de6637e5e3..4f4fb29a49f1b3440cb60fca68f4ad91916522b0 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"