All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heikki Orsila <shdl@zakalwe.fi>
To: Junio C Hamano <gitster@pobox.com>
Cc: Heikki Orsila <heikki.orsila@iki.fi>, git@vger.kernel.org
Subject: Re: [PATCH] Replace "git-" with "git " in *.[ch] comments and notifications
Date: Sat, 30 Aug 2008 04:15:09 +0300	[thread overview]
Message-ID: <20080830011509.GA16289@zakalwe.fi> (raw)
In-Reply-To: <7vvdxj2ucl.fsf@gitster.siamese.dyndns.org>

On Fri, Aug 29, 2008 at 05:56:58PM -0700, Junio C Hamano wrote:
> Heikki Orsila <heikki.orsila@iki.fi> writes:
> 
> > diff --git a/archive.c b/archive.c
> > index e2280df..042f587 100644
> > --- a/archive.c
> > +++ b/archive.c
> > @@ -282,7 +282,7 @@ static int parse_archive_args(int argc, const char **argv,
> >  		OPT_STRING(0, "remote", &remote, "repo",
> >  			"retrieve the archive from remote repository <repo>"),
> >  		OPT_STRING(0, "exec", &exec, "cmd",
> > -			"path to the remote git-upload-archive command"),
> > +			"path to the remote git upload-archive command"),
> >  		OPT_END()
> >  	};
> 
> Are you sure about this one?  How would one spell the command line?
> 
> 	$ git archive --exec='/usr/local/bin/git upload-archive'
> 
> I somehow think this wouldn't fly well.
> 
> I do not think a single patch with the above hunk (which I think is a
> mistake) and other bits that are obviously good (e.g. the first hunk to
> builtin-apply.c we see below) is reviewable, but I cannot think of a
> better alterantive.  Sigh...

OK, wherever git-receive-pack, git-upload-archive or 
git-upload-back was changed to the new form, I changed it back. These 
are afaik the last 3 git-* commands in bindir.

> > @@ -506,17 +506,17 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
> >  		name = orig_name;
> >  		len = strlen(name);
> >  		if (isnull)
> > -			die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
> > +			die("git apply: bad git diff - expected /dev/null, got %s on line %d", name, linenr);
> >  		another = find_name(line, NULL, p_value, TERM_TAB);
> >  		if (!another || memcmp(another, name, len))
> > -			die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
> > +			die("git apply: bad git diff - inconsistent %s filename on line %d", oldnew, linenr);
> 
> I am not sure about this one.  This is not talking about the git-diff
> program, but about a variant of "diff" with git flavour (similar to the
> word "unified diff" -- there is no "unified" command with subcommand
> "diff").   So rolling this kind fo change into a topic that tries to get
> rid of "dashed form of commands" feels quite wrong, even though as a
> general wording improvement, I think it is better than the original (and I
> would even suggest rewording to "git patch", to make sure we are not
> talking about the "git-diff" program).

I'll change it back to git-diff, but retain "git apply".

> I did not look at the rest.

Is the concept OK for this change? I can submit another patch.

-- 
Heikki Orsila
heikki.orsila@iki.fi
http://www.iki.fi/shd

  reply	other threads:[~2008-08-30  1:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-29 23:47 [PATCH] Replace "git-" with "git " in *.[ch] comments and notifications Heikki Orsila
2008-08-30  0:56 ` Junio C Hamano
2008-08-30  1:15   ` Heikki Orsila [this message]
2008-08-30  2:12     ` Junio C Hamano
2008-08-30  9:54       ` Heikki Orsila
2008-08-30 10:08       ` Andreas Ericsson
2008-08-30 11:29       ` Christian Couder

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=20080830011509.GA16289@zakalwe.fi \
    --to=shdl@zakalwe.fi \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=heikki.orsila@iki.fi \
    /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.