contrib/subtree: unwrap tag refs
authorRob Mayoff <mayoff@dqd.com>
Fri, 13 Nov 2015 17:25:49 +0000 (11:25 -0600)
committerJeff King <peff@peff.net>
Tue, 24 Nov 2015 21:53:35 +0000 (16:53 -0500)
commit5d65fe312e22594b7fec7349945fb0072987716b
treefab6982c998962f92f6eda3c64ca827fa36942a4
parent5cb2e162d21fa45a63f186b31970e2e9c9b10ba9
contrib/subtree: unwrap tag refs

If a subtree was added using a tag ref, the tag ref is stored in
the subtree commit message instead of the underlying commit's ref.
To split or push subsequent changes to the subtree, the subtree
command needs to unwrap the tag ref.  This patch makes it do so.

The problem was described in a message to the mailing list from
Junio C Hamano dated 29 Apr 2014, with the subject "Re: git subtree
issue in more recent versions". The archived message can be found
at <http://comments.gmane.org/gmane.comp.version-control.git/247503>.

Signed-off-by: Rob Mayoff <mayoff@dqd.com>
Signed-off-by: Jeff King <peff@peff.net>
contrib/subtree/git-subtree.sh