undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/advice-diverged-history'

Browse Source 
After "git pull" that is configured with pull.rebase=false
merge.ff=only fails due to our end having our own development, give
advice messages to get out of the "Not possible to fast-forward"
state.

* fc/advice-diverged-history:
  advice: add diverging advice for novices
This commit is contained in:
Junio C Hamano 2023-03-19 15:03:12 -07:00
commit 9de14c71f7
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config/advice.txt
View File

@ -136,4 +136,6 @@ advice.*::
Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1] Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1]
is asked to update index entries outside the current sparse is asked to update index entries outside the current sparse
checkout. checkout.
diverging::
Advice shown when a fast-forward is not possible.
-- --

9
advice.c
View File

@ -46,6 +46,7 @@ static struct {
[ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 }, [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 },
[ADVICE_DETACHED_HEAD] = { "detachedHead", 1 }, [ADVICE_DETACHED_HEAD] = { "detachedHead", 1 },
[ADVICE_SUGGEST_DETACHING_HEAD] = { "suggestDetachingHead", 1 }, [ADVICE_SUGGEST_DETACHING_HEAD] = { "suggestDetachingHead", 1 },
[ADVICE_DIVERGING] = { "diverging", 1 },
[ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 }, [ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 },
[ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 }, [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 },
[ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 }, [ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 },
@ -219,6 +220,14 @@ void NORETURN die_conclude_merge(void)
void NORETURN die_ff_impossible(void) void NORETURN die_ff_impossible(void)
{ {
advise_if_enabled(ADVICE_DIVERGING,
_("Diverging branches can't be fast-forwarded, you need to either:\n"
"\n"
"\tgit merge --no-ff\n"
"\n"
"or:\n"
"\n"
"\tgit rebase\n"));
die(_("Not possible to fast-forward, aborting.")); die(_("Not possible to fast-forward, aborting."));
} }

1
advice.h
View File

@ -19,6 +19,7 @@ struct string_list;
ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME, ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
ADVICE_COMMIT_BEFORE_MERGE, ADVICE_COMMIT_BEFORE_MERGE,
ADVICE_DETACHED_HEAD, ADVICE_DETACHED_HEAD,
ADVICE_DIVERGING,
ADVICE_SUGGEST_DETACHING_HEAD, ADVICE_SUGGEST_DETACHING_HEAD,
ADVICE_FETCH_SHOW_FORCED_UPDATES, ADVICE_FETCH_SHOW_FORCED_UPDATES,
ADVICE_GRAFT_FILE_DEPRECATED, ADVICE_GRAFT_FILE_DEPRECATED,