Skip to content

Commit 1224f3d

Browse files
artagnongitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c30754f commit 1224f3d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase--interactive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ then
842842
fi
843843

844844
orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?"
845-
mkdir "$state_dir" || die "Could not create temporary $state_dir"
845+
mkdir -p "$state_dir" || die "Could not create temporary $state_dir"
846846

847847
: > "$state_dir"/interactive || die "Could not mark as interactive"
848848
write_basic_state

0 commit comments

Comments
 (0)