git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jérémy Rosen" <jeremy.rosen@openwide.fr>
To: git@vger.kernel.org
Cc: greened@obbligato.org, pcampbell@kemitix.net, gitster@pobox.com,
	"Jérémy Rosen" <jeremy.rosen@openwide.fr>
Subject: [PATCH 0/2] git subtree: properly handle remote refs
Date: Wed, 13 Mar 2013 17:17:30 +0100	[thread overview]
Message-ID: <1363191452-28804-1-git-send-email-jeremy.rosen@openwide.fr> (raw)

One common use-case for git subtree is to use it only on taged commits from the remote project. however the current implementation of gi-subtree can not be used in that way. two orthogonal prevent this

the SHA used as the origin revision can be the SHA of a tag which isn't available locally. This works correctly at merge time but will fail at split time. The first patch uses the ^{} notation to make sure a correct commit SHA is used instead of the SHA given as a parameter

the checks for the correctness of the target ref to pull or add checks that the name matches a local ref (which is incorrect). The second patch use ls-remote to validate the ref name given against the ones in the remote repository

Jérémy Rosen (2):
  git-subtree: make sure the SHA saved as ancestor is a commit
  git-subtree: use ls-remote to check the refspec passed to pull and
    add

 contrib/subtree/git-subtree.sh |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

-- 
1.7.10.4

             reply	other threads:[~2013-03-13 16:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-13 16:17 Jérémy Rosen [this message]
2013-03-13 16:17 ` [PATCH 1/2] git-subtree: make sure the SHA saved as ancestor is a commit Jérémy Rosen
2013-03-13 16:17 ` [PATCH 2/2] git-subtree: use ls-remote to check the refspec passed to pull and add Jérémy Rosen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1363191452-28804-1-git-send-email-jeremy.rosen@openwide.fr \
    --to=jeremy.rosen@openwide.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=greened@obbligato.org \
    --cc=pcampbell@kemitix.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).