rebase: guard against missing files in read_basic_state()
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Jun 13, 2013 at 21:36 UTC
dc8ca9123a5b8aa21d8e987875aa2112871f4afa
1 file changed
+2
git-rebase.sh
+2
@@ -84,6 +84,8 @@ keep_empty=
84
test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
85
86
read_basic_state () {
87
+ test -f "$state_dir/head-name" &&
88
+ test -f "$state_dir/onto" &&
89
head_name=$(cat "$state_dir"/head-name) &&
90
onto=$(cat "$state_dir"/onto) &&
91
# We always write to orig-head, but interactive rebase used to write to