[PATCH 2/7] rebase -i: don't error out if $state_dir already exists

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Apr 23, 2013, 14:01 UTC
Message-ID: <1366725724-1016-3-git-send-email-artagnon@gmail.com>
In-Reply-To: <1366725724-1016-1-git-send-email-artagnon@gmail.com>

Practically speaking, the only reason why a `mkdir $state_dir` would fail is because $state_dir already exists. There is no problem in this case, and we can proceed as usual. So, change the `mkdir` call to `mkdir -p`, and strip the `|| die`.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 git-rebase--interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 048a140..cc3a9a7 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -837,7 +837,7 @@ then
 fi
 
 orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?"
-mkdir "$state_dir" || die "Could not create temporary $state_dir"
+mkdir -p "$state_dir"
 
 : > "$state_dir"/interactive || die "Could not mark as interactive"
 write_basic_state

-- 
1.8.2.1.578.ga933817