git/contrib/subtree, branch v2.7.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.7.22016-01-20T22:53:18Zcontrib/subtree: fix "subtree split" skipped-merge bug2016-01-20T22:53:18ZDave Waredavidw@realtimegenomics.com2016-01-15T00:41:43Zurn:sha1:933cfeb90b5d03b4096db6d60494a6eedea25d03
'git subtree split' can incorrectly skip a merge even when both parents
act on the subtree, provided the merge results in a tree identical to
one of the parents. Fix by copying the merge if at least one parent is
non-identical, and the non-identical parent is not an ancestor of the
identical parent.
Also, add a test case which checks that a descendant remains a
descendent on the subtree in this case.
Signed-off-by: Dave Ware <davidw@realtimegenomics.com>
Reviewed-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'dg/subtree-test-cleanup'2015-12-01T23:54:31ZJeff Kingpeff@peff.net2015-12-01T23:54:31Zurn:sha1:30fe9b2f9aece7f8f24bc069b9d7470b8291535e
Test cleanups for the subtree project.
* dg/subtree-test-cleanup:
contrib/subtree: Handle '--prefix' argument with a slash appended
contrib/subtree: Make each test self-contained
contrib/subtree: Add split tests
contrib/subtree: Add merge tests
contrib/subtree: Add tests for subtree add
contrib/subtree: Add test for missing subtree
contrib/subtree: Clean and refactor test code
contrib/subtree: Handle '--prefix' argument with a slash appended2015-11-13T05:02:56ZTechlive Zhengtechlivezheng@gmail.com2015-11-13T02:32:36Zurn:sha1:d16031caf106dda2da52f10ef809cf4bfc83f7be
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree: Make each test self-contained2015-11-13T05:02:56ZTechlive Zhengtechlivezheng@gmail.com2015-11-13T02:32:35Zurn:sha1:43711746bd01eff9d8bac658bf1d6a39151088f2
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 <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree: Add split tests2015-11-13T05:02:56ZTechlive Zhengtechlivezheng@gmail.com2015-11-13T02:32:34Zurn:sha1:4fe2e33cc961328ea24e821692abc305d28e8ddb
Add tests to check various options to split. Check combinations of
--prefix, --message, --annotate, --branch and --rejoin.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree: Add merge tests2015-11-13T05:02:56ZTechlive Zhengtechlivezheng@gmail.com2015-11-13T02:32:33Zurn:sha1:4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6
Add some tests for various merge operations. Test combinations of merge
with --message, --prefix and --squash.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree: Add tests for subtree add2015-11-13T05:02:56ZTechlive Zhengtechlivezheng@gmail.com2015-11-13T02:32:32Zurn:sha1:c9924996c95cfcc7633448e7ee8b88f440ccbd2b
Add some tests to check various options to subtree add. These test
various combinations of --message, --prefix and --squash.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree: Add test for missing subtree2015-11-13T05:02:56ZTechlive Zhengtechlivezheng@gmail.com2015-11-13T02:32:31Zurn:sha1:a686701184bc9e3d54b2870455f3ff276360299e
Test that a merge from a non-existant subtree fails.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree: Clean and refactor test code2015-11-13T05:02:56ZTechlive Zhengtechlivezheng@gmail.com2015-11-13T02:32:30Zurn:sha1:b0638aa2f8f7fa4e9c5d8569ee30b64fc21fba32
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 <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree: remove "push" command from the "todo" file2015-11-06T17:32:33ZFabio Porceddafabio.porcedda@gmail.com2015-11-05T15:26:57Zurn:sha1:45470396499488d9c8ddc8e0008d2596d5926931
Because the "push" command is already available, remove it from the
"todo" file.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>