about summary refs log tree commit diff
path: root/third_party/git/rebase.c
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/rebase.c
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff)
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping
it in sync with cgit would be easier this way, but it has proven not
to be a big issue.

On the other hand, a vendored copy of git is an annoying maintenance
burden. It is much easier to rebase the single (dottime) patch that we
have.

This removes the vendored copy of git and instead passes the git
source code to cgit via `pkgs.srcOnly`, which includes the applied
patch so that cgit can continue rendering dottime.

Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
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 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.<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;
-}