diff options
author | Pratik Karki <predatoramigo@gmail.com> | 2018-08-08 20:51:22 +0545 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-06 11:55:58 -0700 |
commit | 0eabf4b95ca2d3213194de95cc9cd62593811965 (patch) | |
tree | fe75e31ca88313d4a4c9be6cb590ed2c58c3a55e /builtin | |
parent | builtin rebase: actions require a rebase in progress (diff) | |
download | tgif-0eabf4b95ca2d3213194de95cc9cd62593811965.tar.xz |
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>
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(); |