about summary refs log tree commit diff
path: root/third_party/git/contrib/subtree/todo
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/contrib/subtree/todo
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/contrib/subtree/todo')
-rw-r--r--third_party/git/contrib/subtree/todo48
1 files changed, 0 insertions, 48 deletions
diff --git a/third_party/git/contrib/subtree/todo b/third_party/git/contrib/subtree/todo
deleted file mode 100644
index 0d0e777651..0000000000
--- a/third_party/git/contrib/subtree/todo
+++ /dev/null
@@ -1,48 +0,0 @@
-
-	delete tempdir
-
-	'git subtree rejoin' option to do the same as --rejoin, eg. after a
-	  rebase
-
-	--prefix doesn't force the subtree correctly in merge/pull:
-	"-s subtree" should be given an explicit subtree option?
-		There doesn't seem to be a way to do this.  We'd have to
-		patch git-merge-subtree.  Ugh.
-		(but we could avoid this problem by generating squashes with
-		exactly the right subtree structure, rather than using
-		subtree merge...)
-
-	add a 'log' subcommand to see what's new in a subtree?
-
-	add to-submodule and from-submodule commands
-
-	automated tests for --squash stuff
-
-	"add" command non-obviously requires a commitid; would be easier if
-		it had a "pull" sort of mode instead
-
-	"pull" and "merge" commands should fail if you've never merged
-		that --prefix before
-		
-	docs should provide an example of "add"
-	
-	note that the initial split doesn't *have* to have a commitid
-		specified... that's just an optimization
-
-	if you try to add (or maybe merge?) with an invalid commitid, you
-		get a misleading "prefix must end with /" message from
-		one of the other git tools that git-subtree calls.  Should
-		detect this situation and print the *real* problem.
-	
-	"pull --squash" should do fetch-synthesize-merge, but instead just
-		does "pull" directly, which doesn't work at all.
-
-	make a 'force-update' that does what 'add' does even if the subtree
-		already exists.  That way we can help people who imported
-		subtrees "incorrectly" (eg. by just copying in the files) in
-		the past.
-
-	guess --prefix automatically if possible based on pwd
-
-	make a 'git subtree grafts' that automatically expands --squash'd
-		commits so you can see the full history if you want it.