mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
13be3e31f1
The old "advice" message explained how to create a branch after going into a detached HEAD state but didn't make it clear why the user may want to do so. Also "moving to ... which isn't a local branch" was unclear if it is complaining, if it is describing the new state, or if it is explaining why the HEAD is detached (the true reason is the last one). Give the established phrase 'detached HEAD' first to make it easy for users to look up the concept in documentation, and briefly describe what can be done in the state (i.e. play around without having to clean up) before telling the user how to keep what was done during the temporary state. Allow the long description to be hidden by setting advice.detachedHead configuration to false. We might want to customize the advice depending on how the commit to check out was spelled (e.g. instead of "new-branch-name", we way want to say "topic" when "git checkout origin/topic" triggered this message) in later updates, but this encapsulates that into a separate function and it should be a good first step. Signed-off-by: Junio C Hamano <gitster@pobox.com>
49 lines
1.4 KiB
C
49 lines
1.4 KiB
C
#include "cache.h"
|
|
|
|
int advice_push_nonfastforward = 1;
|
|
int advice_status_hints = 1;
|
|
int advice_commit_before_merge = 1;
|
|
int advice_resolve_conflict = 1;
|
|
int advice_implicit_identity = 1;
|
|
int advice_detached_head = 1;
|
|
|
|
static struct {
|
|
const char *name;
|
|
int *preference;
|
|
} advice_config[] = {
|
|
{ "pushnonfastforward", &advice_push_nonfastforward },
|
|
{ "statushints", &advice_status_hints },
|
|
{ "commitbeforemerge", &advice_commit_before_merge },
|
|
{ "resolveconflict", &advice_resolve_conflict },
|
|
{ "implicitidentity", &advice_implicit_identity },
|
|
{ "detachedhead", &advice_detached_head },
|
|
};
|
|
|
|
int git_default_advice_config(const char *var, const char *value)
|
|
{
|
|
const char *k = skip_prefix(var, "advice.");
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(advice_config); i++) {
|
|
if (strcmp(k, advice_config[i].name))
|
|
continue;
|
|
*advice_config[i].preference = git_config_bool(var, value);
|
|
return 0;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void NORETURN die_resolve_conflict(const char *me)
|
|
{
|
|
if (advice_resolve_conflict)
|
|
/*
|
|
* Message used both when 'git commit' fails and when
|
|
* other commands doing a merge do.
|
|
*/
|
|
die("'%s' is not possible because you have unmerged files.\n"
|
|
"Please, fix them up in the work tree, and then use 'git add/rm <file>' as\n"
|
|
"appropriate to mark resolution and make a commit, or use 'git commit -a'.", me);
|
|
else
|
|
die("'%s' is not possible because you have unmerged files.", me);
|
|
}
|