git/subtree at 2fc9e9ca3c7505bc60069f11e7ef09b1aeeee473 - git

Tree: 2fc9e9ca3c

Philippe Blain 1762382ab1 subtree: fix split after annotated tag was squashed merged The previous commit fixed a failure in 'git subtree merge --squash' when the previous squash-merge merged an annotated tag of the subtree repository which is missing locally. The same failure happens in 'git subtree split', either directly or when called by 'git subtree push', under the same circumstances: 'cmd_split' invokes 'find_existing_splits', which loops through previous commits and invokes 'git rev-parse' (via 'process_subtree_split_trailer') on the value of any 'git subtree-split' trailer it finds. This fails if this value is the hash of an annotated tag which is missing locally. Add a new optional argument 'repository' to 'cmd_split' and 'find_existing_splits', and invoke 'cmd_split' with that argument from 'cmd_push'. This allows 'process_subtree_split_trailer' to try to fetch the missing tag from the 'repository' if it's not available locally, mirroring the new behaviour of 'git subtree pull' and 'git subtree merge'. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2 years ago
..
t	subtree: fix split after annotated tag was squashed merged	2 years ago
.gitignore	…
COPYING	…
INSTALL	…
Makefile	…
README	…
git-subtree.sh	subtree: fix split after annotated tag was squashed merged	2 years ago
git-subtree.txt	subtree: fix split after annotated tag was squashed merged	2 years ago
todo	subtree: give the docs a once-over	4 years ago

README


Please read git-subtree.txt for documentation.

Please don't contact me using github mail; it's slow, ugly, and worst of
all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to
help.

Avery