From: Pratik Karki Date: Wed, 08 Aug 2018 15:06:22 GMT Subject: [PATCH 7/7] builtin rebase: stop if `git am` is in progress Message-ID: <20180808150622.9614-8-predatoramigo@gmail.com> In-Reply-To: <20180808150622.9614-1-predatoramigo@gmail.com> This commit checks for the file `applying` used by `git am` in `rebase-apply/` and if the file is present it means `git am` is in progress so it errors out. Signed-off-by: Pratik Karki --- builtin/rebase.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builtin/rebase.c b/builtin/rebase.c index 1344e071f3..75c4ac66e0 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(); -- 2.18.0