From: Pratik Karki <predatoramigo@gmail.com>
Date: Wed, 8 Aug 2018 15:06:22 +0000 (+0545)
Subject: builtin rebase: stop if `git am` is in progress
X-Git-Tag: v2.20.0-rc0~92^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0eabf4b95ca2d3213194de95cc9cd62593811965;p=thirdparty%2Fgit.git

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

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 <predatoramigo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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();