about summary refs log tree commit diff
path: root/third_party/git/rebase.c
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/rebase.c
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/rebase.c')
-rw-r--r--third_party/git/rebase.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/third_party/git/rebase.c b/third_party/git/rebase.c
deleted file mode 100644
index f8137d859b..0000000000
--- 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.<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, "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;
-}