All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Steffen Prohaska <prohaska@zib.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/8] rev-parse: teach "git rev-parse --symbolic" to print the full ref name
Date: Sun, 28 Oct 2007 00:28:27 -0700	[thread overview]
Message-ID: <7v3avvy9yc.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 11935038083369-git-send-email-prohaska@zib.de

Steffen Prohaska <prohaska@zib.de> writes:

> "git rev-parse --symbolic" used to return the ref name as it was
> specified on the command line. This is changed to returning the
> full matched ref name, i.e. "git rev-parse --symbolic master"
> now typically returns "refs/heads/master".

This is to expose "dwim_ref" logic, so it might be a good idea
to introduce a new option --dwim-ref for this purpose.

	git rev-parse --symbolic master^2

is designed to give "master^2" or fail if "master" is not a
merge.  Similarly, you would diagnose a failure if somebody asks
to show

	git rev-parse --dwim-ref master~4

instead of giving "refs/heads/master~4".

> +static void show_rev(int type, const unsigned char *sha1, const char *name, const char* real_name)
> @@ -131,7 +133,7 @@ static void show_default(void)
>  
>  		def = NULL;
>  		if (!get_sha1(s, sha1)) {
> -			show_rev(NORMAL, sha1, s);
> +			show_rev(NORMAL, sha1, s, 0);

A null pointer constant in git sources is spelled "NULL" not "0".

> @@ -213,6 +215,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
>  {
>  	int i, as_is = 0, verify = 0;
>  	unsigned char sha1[20];
> +	char* real_name = 0;

Pointer sign '*' in git sources go next to the name not the
type, as:

	char *real_name = NULL;

  parent reply	other threads:[~2007-10-28  7:28 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-27 16:49 [PATCH 0/8 v2] improve push's refspec handling Steffen Prohaska
2007-10-27 16:50 ` [PATCH 1/8] push: change push to fail if short ref name does not exist Steffen Prohaska
2007-10-27 16:50   ` [PATCH 2/8] push: teach push new flag --create Steffen Prohaska
2007-10-27 16:50     ` [PATCH 3/8] add get_sha1_with_real_ref() returning full name of ref on demand Steffen Prohaska
2007-10-27 16:50       ` [PATCH 4/8] rev-parse: teach "git rev-parse --symbolic" to print the full ref name Steffen Prohaska
2007-10-27 16:50         ` [PATCH 5/8] push, send-pack: support pushing HEAD to real " Steffen Prohaska
2007-10-27 16:50           ` [PATCH 6/8] add ref_cmp_full_short() comparing full ref name with a short name Steffen Prohaska
2007-10-27 16:50             ` [PATCH 7/8] push: use same rules as git-rev-parse to resolve refspecs Steffen Prohaska
2007-10-27 16:50               ` [PATCH 8/8] push: teach push to be quiet if local ref is strict subset of remote ref Steffen Prohaska
2007-10-28  7:28                 ` Junio C Hamano
2007-10-28  8:20                   ` Steffen Prohaska
2007-10-28  7:28               ` [PATCH 7/8] push: use same rules as git-rev-parse to resolve refspecs Junio C Hamano
2007-10-27 22:16             ` [PATCH 6/8] add ref_cmp_full_short() comparing full ref name with a short name Daniel Barkalow
2007-10-28  7:28             ` Junio C Hamano
2007-10-27 22:03           ` [PATCH 5/8] push, send-pack: support pushing HEAD to real ref name Daniel Barkalow
2007-10-28  7:28           ` Junio C Hamano
2007-10-28  8:03             ` Steffen Prohaska
2007-10-28 15:10             ` Steffen Prohaska
2007-10-28 15:40               ` Junio C Hamano
2007-10-28 15:59                 ` Steffen Prohaska
2007-10-28 16:03                 ` Junio C Hamano
2007-10-28 16:30                   ` Steffen Prohaska
2007-10-28 20:58                     ` Junio C Hamano
2007-10-31 15:08                       ` Steffen Prohaska
2007-10-27 21:53         ` [PATCH 4/8] rev-parse: teach "git rev-parse --symbolic" to print the full " Daniel Barkalow
2007-10-28 13:49           ` Steffen Prohaska
2007-10-28  7:28         ` Junio C Hamano [this message]
2007-10-28  7:58           ` Steffen Prohaska
2007-10-28  8:06             ` Shawn O. Pearce
2007-10-28  8:56               ` Steffen Prohaska
2007-10-28 15:10                 ` Brian Gernhardt
2007-10-28  8:24             ` Junio C Hamano
2007-10-28  7:28       ` [PATCH 3/8] add get_sha1_with_real_ref() returning full name of ref on demand Junio C Hamano
2007-10-27 21:42   ` [PATCH 1/8] push: change push to fail if short ref name does not exist Daniel Barkalow
2007-10-28  7:28   ` Junio C Hamano
2007-10-28  8:43     ` Steffen Prohaska

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=7v3avvy9yc.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=prohaska@zib.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.