builtin rebase: stop if `git am` is in progress

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 9238757443832d2ec4b50edead00e1d7ac03ac10..2165656ae24a872a5faebc9fcac470aa933a194d 100644 (file)
--- 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();