[PATCH 5/5] rebase: read state explicitly in '--abort'
- From
martin.von.zweigbergk@gmail.com <martin.von.zweigbergk@gmail.com>
- Date
- Nov 3, 2010, 21:09 UTC
- Message-ID
- <1288818580-7576-6-git-send-email-martin.von.zweigbergk@gmail.com>
- In-Reply-To
- <1288818580-7576-1-git-send-email-martin.von.zweigbergk@gmail.com>
From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
The only place where the state was not already read when move_to_original_branch was called was in the '--abort' case. Read the state explicitly there and remove it from move_to_original_branch.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> --- git-rebase.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh index a7428ea..847555c 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -147,7 +147,6 @@ call_merge () { } move_to_original_branch () { - test -z "$head_name" && read_state case "$head_name" in refs/*) message="rebase finished: $head_name onto $onto" @@ -266,6 +265,7 @@ do die "No rebase in progress?" git rerere clear + read_state move_to_original_branch git reset --hard $orig_head rm -r "$state_dir"
-- 1.7.3.rc1.4.g5879b6