summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2021-07-21 01:42:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-21 04:43:12 (GMT)
commit3d5fc24daefbdf56bc36a491aed0b7990fa0c62f (patch)
treeef359b69c3e219588b10455b6fe7d89976df9f93 /advice.h
parent1d25e5bdf5263a227d233eafcf028b36c72716f6 (diff)
downloadgit-3d5fc24daefbdf56bc36a491aed0b7990fa0c62f.zip
git-3d5fc24daefbdf56bc36a491aed0b7990fa0c62f.tar.gz
git-3d5fc24daefbdf56bc36a491aed0b7990fa0c62f.tar.bz2
pull: abort if --ff-only is given and fast-forwarding is impossible
The warning about pulling without specifying how to reconcile divergent branches says that after setting pull.rebase to true, --ff-only can still be passed on the command line to require a fast-forward. Make that actually work. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> [en: updated tests; note 3 fixes and 1 new failure] Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index bd26c38..1624043 100644
--- a/advice.h
+++ b/advice.h
@@ -95,6 +95,7 @@ void advise_if_enabled(enum advice_type type, const char *advice, ...);
int error_resolve_conflict(const char *me);
void NORETURN die_resolve_conflict(const char *me);
void NORETURN die_conclude_merge(void);
+void NORETURN die_ff_impossible(void);
void advise_on_updating_sparse_paths(struct string_list *pathspec_list);
void detach_advice(const char *new_name);