diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2013-05-12 17:26:36 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-12 23:20:07 -0700 |
| commit | 1224f3d0f1b47fc640e76b053f25d91e3ca84bcf (patch) | |
| tree | 023b280194a6eac156b48a6d875745f22d30d2fa /git-rebase--interactive.sh | |
| parent | c30754f188a4f1bcd35d81d898086fea33524bd6 (diff) | |
| download | git-1224f3d0f1b47fc640e76b053f25d91e3ca84bcf.tar.gz git-1224f3d0f1b47fc640e76b053f25d91e3ca84bcf.tar.xz | |
rebase -i: don't error out if $state_dir already exists
In preparation for a later patch that will create $state_dir/autostash
in git-rebase.sh before anything else can happen, change a `mkdir
$state_dir` call to `mkdir -p $state_dir`. The change is safe,
because this is not a test to detect an in-progress rebase (that is
already done much earlier in git-rebase.sh).
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 5822b2c59..34111395b 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -842,7 +842,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" || die "Could not create temporary $state_dir" : > "$state_dir"/interactive || die "Could not mark as interactive" write_basic_state |