kernel/git - git - PowerEL Git System

Tree: a64f3a7286

Author	SHA1	Message	Date
Avery Pennarun	a64f3a7286	Trim some extra merge commits that don't need to go into the split tree. ...and update test.sh to test for this.	16 years ago
Avery Pennarun	a046c7b124	test.sh tweak	16 years ago
Avery Pennarun	1490e1546a	Add some basic assertions to test.sh.	16 years ago
Avery Pennarun	0ad3dd8534	Add a 'create' helper function in test.sh.	16 years ago
Avery Pennarun	d0eb1b1417	Add --annotate option, and create recognizable file content during tests.	16 years ago
Avery Pennarun	a13a299996	Change test.sh to test the new add, merge, and pull commands.	16 years ago
Avery Pennarun	9a8821ff33	Pass the path using the --prefix option instead of on the command line. I like this better. It's more like git-read-tree and some other commands.	16 years ago
Avery Pennarun	96db2c0448	Okay, that was a little too aggressive. Now we only prune out a commit if it has exactly one remaining parent and that parent's tree is identical to ours. But I also changed the test to create the initial "-s ours" merge in one step instead of two, and that merge can be eliminated since one of its parents doesn't affect the subdir at all, and is thus deleted.	16 years ago
Avery Pennarun	d691265880	Even more aggressive commit trimming. Now we cut out a commit if any of its parents had the same tree; just use that parent in its place. This makes the history look nice, but I don't think it's quite right...	16 years ago
Avery Pennarun	847e868167	Quick test script for generating reasonably complex merge scenarios.	16 years ago