From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/rebase.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 third_party/git/rebase.c (limited to 'third_party/git/rebase.c') diff --git a/third_party/git/rebase.c b/third_party/git/rebase.c deleted file mode 100644 index f8137d859b51..000000000000 --- a/third_party/git/rebase.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "rebase.h" -#include "config.h" - -/* - * Parses textual value for pull.rebase, branch..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, "preserve") || !strcmp(value, "p")) - return REBASE_PRESERVE; - else if (!strcmp(value, "merges") || !strcmp(value, "m")) - return REBASE_MERGES; - else if (!strcmp(value, "interactive") || !strcmp(value, "i")) - return REBASE_INTERACTIVE; - /* - * Please update _git_config() in git-completion.bash when you - * add new rebase modes. - */ - - return REBASE_INVALID; -} -- cgit 1.4.1