public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: "Shawn O. Pearce" <spearce@spearce•org>
To: Charles O'Farrell <charleso@charleso•org>
Cc: git@vger•kernel.org
Subject: Re: [JGIT PATCH] Added forward slash to head/remote/tag prefix Constants
Date: Fri, 22 Aug 2008 09:53:27 -0700	[thread overview]
Message-ID: <20080822165327.GL3483@spearce.org> (raw)
In-Reply-To: <1219352122-5865-1-git-send-email-charleso@charleso.org>

Charles O'Farrell <charleso@charleso•org> wrote:
> eg. Constants.HEADS_PREFIX + "/" ==> Constants.R_HEADS
> 
> This was always done by every instance anyway and so this will ensure
> it isn't forgotten again.

Thanks, applied.  I had to hand-merge a few sections due to Marek's
push UI going in before your patch, but your patch not having the
necessary changes.  Using a different constant name helped make
that resolution less painful.
 
> --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java
> +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java
> @@ -184,12 +181,12 @@ protected static String abbreviateObject(final ObjectId id) {
>  	}
>  
>  	protected String abbreviateRef(String dst, boolean abbreviateRemote) {
> -		if (dst.startsWith(REFS_HEADS))
> -			dst = dst.substring(REFS_HEADS.length());
> -		else if (dst.startsWith(REFS_TAGS))
> -			dst = dst.substring(REFS_TAGS.length());
> -		else if (abbreviateRemote && dst.startsWith(REFS_REMOTES))
> -			dst = dst.substring(REFS_REMOTES.length());
> +		if (dst.startsWith(R_HEADS))
> +			dst = dst.substring(R_HEADS.length());
> +		else if (dst.startsWith(R_TAGS))
> +			dst = dst.substring(R_HEADS.length());

This should be R_TAGS. I fixed it when I applied the patch.

-- 
Shawn.

     prev parent reply	other threads:[~2008-08-22 16:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-21 20:55 [JGIT PATCH] Added forward slash to head/remote/tag prefix Constants Charles O'Farrell
2008-08-22 16:53 ` Shawn O. Pearce [this message]

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=20080822165327.GL3483@spearce.org \
    --to=spearce@spearce$(echo .)org \
    --cc=charleso@charleso$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox