diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 9238757443..2165656ae2 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -539,6 +539,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) git_config(rebase_config, &options); + strbuf_reset(&buf); + strbuf_addf(&buf, "%s/applying", apply_dir()); + if(file_exists(buf.buf)) + die(_("It looks like 'git am' is in progress. Cannot rebase.")); + if (is_directory(apply_dir())) { options.type = REBASE_AM; options.state_dir = apply_dir(); |