mirror of
https://github.com/git/git
synced 2024-11-05 01:58:18 +00:00
8bff5ca030
We had several C files ignoring the rule to include one of the appropriate headers first; fix that. While at it, the rule in Documentation/CodingGuidelines about which header to include has also fallen out of sync, so update the wording to mention other allowed headers. Unfortunately, C files in reftable/ don't actually follow the previous or updated rule. If you follow the #include chain in its C files, reftable/system.h _tends_ to be first (i.e. record.c first includes record.h, which first includes basics.h, which first includees system.h), but not always (e.g. publicbasics.c includes another header first that does not include system.h). However, I'm going to punt on making actual changes to the C files in reftable/ since I do not want to risk bringing it out-of-sync with any version being used externally. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
37 lines
1.1 KiB
C
37 lines
1.1 KiB
C
#include "git-compat-util.h"
|
|
#include "rebase.h"
|
|
#include "config.h"
|
|
#include "gettext.h"
|
|
|
|
/*
|
|
* Parses textual value for pull.rebase, branch.<name>.rebase, etc.
|
|
* Unrecognised value yields REBASE_INVALID, which traditionally is
|
|
* treated the same way as REBASE_FALSE.
|
|
*
|
|
* The callers that care if (any) rebase is requested should say
|
|
* if (REBASE_TRUE <= rebase_parse_value(string))
|
|
*
|
|
* The callers that want to differenciate an unrecognised value and
|
|
* false can do so by treating _INVALID and _FALSE differently.
|
|
*/
|
|
enum rebase_type rebase_parse_value(const char *value)
|
|
{
|
|
int v = git_parse_maybe_bool(value);
|
|
|
|
if (!v)
|
|
return REBASE_FALSE;
|
|
else if (v > 0)
|
|
return REBASE_TRUE;
|
|
else if (!strcmp(value, "merges") || !strcmp(value, "m"))
|
|
return REBASE_MERGES;
|
|
else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
|
|
return REBASE_INTERACTIVE;
|
|
else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
|
|
error(_("%s: 'preserve' superseded by 'merges'"), value);
|
|
/*
|
|
* Please update _git_config() in git-completion.bash when you
|
|
* add new rebase modes.
|
|
*/
|
|
|
|
return REBASE_INVALID;
|
|
}
|