contrib/subtree: allow adding an annotated tag
commit6f1871fe0f7d9bddfbe199cceeb255cf8edbaab3
authorJames Denholm <nod.helm@gmail.com>
Tue, 13 May 2014 04:08:58 +0000 (13 14:08 +1000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 May 2014 19:33:26 +0000 (13 12:33 -0700)
tree16177315dec7727e132af53503eb0bbe9004ac27
parent602efc4f90295369763cc58b47c3c6532a070fe9
contrib/subtree: allow adding an annotated tag

cmd_add_commit() is passed FETCH_HEAD by cmd_add_repository, which
is then rev-parsed into an object name.  However, if the user is
fetching a tag rather than a branch HEAD, such as by executing:

  $ git subtree add -P oldGit https://github.com/git/git.git tags/v1.8.0

the object name refers to a tag and is never peeled, and the git
commit-tree call (line 561) slaps us in the face because it doesn't
peel tags to commits.

Because peeling a committish doesn't do anything if it's already a
commit, fix by peeling the object name before assigning it to $rev
using peel_committish() from git:git-sh-setup.sh, a pre-existing
dependency of git-subtree.

Reported-by: Kevin Cagle <kcagle@micron.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: James Denholm <nod.helm@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/subtree/git-subtree.sh