[PATCH v6 1/1] contrib/subtree: Add a test for subtree rebase that loses commits

From: David A. Greene This test merges an external tree in as a subtree, makes some commits on top of it and splits it back out. In the process the added commits are lost or the rebase aborts with an internal error. The tests are marked to expect failure so that we don't

Re: Detecting redundant commits

On January 4, 2016 10:00:26 PM CST, Jeff King wrote: >Or do you mean commits that, when applied, we find turn out to have >empty changes (e.g., because we have a set of commits that have >different patch-ids, but do roughly the same thing)? I don't think you >can find that with

[PATCH] Test rebase -Xsubtree

Here is a test that finds a bug in rebase -Xsubtree. With --preserve-merges, commits are lost. -David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at

[PATCH] Add a test for subtree rebase that loses commits

From: "David A. Greene" This test merges an external tree in as a subtree, makes some commits on top of it and splits it back out. In the process the added commits are lost. This is marked to expect failure so that we don't forget to fix it. Signed-off-by: David A.

Re: (unknown)

Patrick Steinhardt <p...@pks.im> writes: > On Tue, Dec 15, 2015 at 09:57:50PM -0800, Junio C Hamano wrote: >> David Greene <gree...@obbligato.org> writes: >> >> > - If new option --keep-redundant is specified, invoke cherry-pick with >> >

[PATCH] Support rebase --keep-empty and --keep-redundant

From: "David A. Greene" Teach rebase how to invoke cherry-pick to keep empty commits. Add a new option --keep-redundant equivalent to cherry-pick's --keep-redundant-commits. With this option, rebase will preserve empty commits generated as a result of the merging

[no subject]

This patch isn't ready for prime-time yet but I wanted to get it out for some discussion. While cleaning up and enhancing git-subtree, I've come across the need to have rebase behave nicely in the case of empty and redundant commits. There's a case in pick_one_preserving_merges where git-cherry

[PATCH 7/7] contrib/subtree: Handle '--prefix' argument with a slash appended

From: Techlive Zheng 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh | 2 +-

[PATCH 6/7] contrib/subtree: Make each test self-contained

From: Techlive Zheng Each test runs a full repository creation and any subtree actions needed to perform the test. Each test starts with a clean slate, making debugging and post-mortem analysis much easier. Signed-off-by: Techlive Zheng

[PATCH 4/7] contrib/subtree: Add merge tests

From: Techlive Zheng Add some tests for various merge operations. Test combinations of merge with --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---

[PATCH 3/7] contrib/subtree: Add tests for subtree add

From: Techlive Zheng Add some tests to check various options to subtree add. These test various combinations of --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---

[PATCH 1/7] contrib/subtree: Clean and refactor test code

From: Techlive Zheng Mostly prepare for the later tests refactoring. This moves some common code to helper functions and generally cleans things up to be more presentable. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene

[PATCH 5/7] contrib/subtree: Add split tests

From: Techlive Zheng Add tests to check various options to split. Check combinations of --prefix, --message, --annotate, --branch and --rejoin. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---

[PATCH 2/7] contrib/subtree: Add test for missing subtree

From: Techlive Zheng Test that a merge from a non-existant subtree fails. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 4 1 file changed, 4 insertions(+)

[no subject]

I'm processing some old patches I have lying around. These clean up git-subtree's test base and refactor the test code so that each test is independent of the others. This greatly aids debugging and post-mortem analysis. I have rebased these old patches on master, ensuring that new tests that

[PATCH 3/7] contrib/subtree: Add tests for subtree add

From: Techlive Zheng Add some tests to check various options to subtree add. These test various combinations of --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---

[PATCH 1/7] contrib/subtree: Clean and refactor test code

From: Techlive Zheng Mostly prepare for the later tests refactoring. This moves some common code to helper functions and generally cleans things up to be more presentable. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene

[PATCH 2/7] contrib/subtree: Add test for missing subtree

From: Techlive Zheng Test that a merge from a non-existant subtree fails. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 4 1 file changed, 4 insertions(+)

[PATCH 5/7] contrib/subtree: Add split tests

From: Techlive Zheng Add tests to check various options to split. Check combinations of --prefix, --message, --annotate, --branch and --rejoin. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---

[PATCH 4/7] contrib/subtree: Add merge tests

From: Techlive Zheng Add some tests for various merge operations. Test combinations of merge with --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---

[PATCH 7/7] contrib/subtree: Handle '--prefix' argument with a slash appended

From: Techlive Zheng 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh | 2 +-