All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCHv3] replace: parse revision argument for -d
Date: Tue, 13 Nov 2012 11:25:42 +0100	[thread overview]
Message-ID: <50A22026.60506@drmicha.warpmail.net> (raw)
In-Reply-To: <20121112204254.GH4623@sigill.intra.peff.net>

Jeff King venit, vidit, dixit 12.11.2012 21:42:
> On Mon, Nov 12, 2012 at 03:18:02PM +0100, Michael J Gruber wrote:
> 
>> 'git replace' parses the revision arguments when it creates replacements
>> (so that a sha1 can be abbreviated, e.g.) but not when deleting
>> replacements.
>>
>> Make it parse the argument to 'replace -d' in the same way.
>>
>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
>> ---
>>
>> Notes:
>>     v3 safeguards the hex buffer against reuse
> 
> Thanks, I don't see any other functional problems.
> 
>> diff --git a/builtin/replace.c b/builtin/replace.c
>> index e3aaf70..33e6ec3 100644
>> --- a/builtin/replace.c
>> +++ b/builtin/replace.c
>> @@ -46,24 +46,28 @@ typedef int (*each_replace_name_fn)(const char *name, const char *ref,
>>  
>>  static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
>>  {
>> -	const char **p;
>> +	const char **p, *q;
> 
> I find this readable today, but I wonder if in six months we will wonder
> what in the world "q" means. Maybe "short_refname" or something would be
> appropriate?

That would be sooo inappropriate! ;)

Maybe "full_hex"?

I should also do away with the first replacement which really made sense
in v1 only.

v4 to follow.

Michael

  reply	other threads:[~2012-11-13 10:25 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-26 13:33 [PATCH] replace: parse revision argument for -d Michael J Gruber
2012-10-26 15:25 ` Christian Couder
2012-10-29  6:58 ` Jeff King
2012-10-29  9:02   ` Michael J Gruber
2012-10-29  9:04     ` Jeff King
2012-10-29 10:08       ` Michael J Gruber
2012-10-29 13:23         ` [PATCHv2] " Michael J Gruber
2012-11-09 16:48           ` Jeff King
2012-11-12  8:51             ` Michael J Gruber
2012-11-12 14:18               ` [PATCHv3] " Michael J Gruber
2012-11-12 20:42                 ` Jeff King
2012-11-13 10:25                   ` Michael J Gruber [this message]
2012-11-13 10:34                     ` [PATCHv4] " Michael J Gruber
2012-11-13 13:37                       ` Jeff King
2012-11-13 10:30                 ` Notes in format-patch (was: Re: [PATCHv3] replace: parse revision argument for -d) Michael J Gruber
2012-11-13 13:38                   ` Jeff King
2012-11-13 16:29                   ` Notes in format-patch Junio C Hamano
2012-11-13 16:56                     ` Junio C Hamano
2012-11-13 17:26                       ` Junio C Hamano
2012-11-13 18:09                         ` Junio C Hamano
2012-11-14  9:17                           ` Michael J Gruber
2012-11-14 13:15                             ` Junio C Hamano

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=50A22026.60506@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.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 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.