OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5879477
)
rebase: guard against missing files in read_basic_state()
author
Ramkumar Ramachandra
<artagnon@gmail.com>
Thu, 13 Jun 2013 16:06:11 +0000
(21:36 +0530)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 13 Jun 2013 22:29:44 +0000
(15:29 -0700)
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase.sh
patch
|
blob
|
history
diff --git
a/git-rebase.sh
b/git-rebase.sh
index
d0c11a9
..
2122fe0
100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-84,6
+84,8
@@
keep_empty=
test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
read_basic_state () {
+ test -f "$state_dir/head-name" &&
+ test -f "$state_dir/onto" &&
head_name=$(cat "$state_dir"/head-name) &&
onto=$(cat "$state_dir"/onto) &&
# We always write to orig-head, but interactive rebase used to write to