From: Jonathan Nieder <jrnieder@gmail.com>
To: Knittl <knittl89@googlemail.com>
Cc: git@vger.kernel.org, Tay Ray Chuan <rctay89@gmail.com>
Subject: Re: [PATCH re-roll] Do not display 'Switched to a new branch' when the branch existed
Date: Wed, 18 Aug 2010 04:16:03 -0500 [thread overview]
Message-ID: <20100818091603.GA6263@burratino> (raw)
In-Reply-To: <AANLkTi=3z9gJdT8LL3NANFyppUjvOVcrszjf5J5zAKPe@mail.gmail.com>
Hi,
Warning: nitpicks coming.
Knittl wrote:
> From 16f540c87f8c7b87692dfd488d507802ae975312 Mon Sep 17 00:00:00 2001
> From: Daniel Knittl-Frank <knittl89+git@googlemail.com>
> Date: Wed, 18 Aug 2010 10:35:42 +0200
> Subject: [PATCH] builtin/checkout: fix info message for `git checkout <branch>`
On the git list, there are two formats often used for patches (see
Documentation/SubmittingPatches for details): whole-message patches,
which look like this:
git checkout should only display 'Switched to a new branch <branch>'
when it creates a new branch, not when it simply switches branches.
This fixes a bug introduced by 02ac9837 (builtin/checkout:
learn -B, 2010-06-24).
Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
---
comments of the moment
diffstat
...
and "inline" patches, which look like this:
comments of the moment
-- 8< --
Subject: patch subject
patch rationale
---
diffstat
...
and sometimes get used when it is more natural for discussion.
The "From " line and so on output by "git format-patch" are for your
mailer. Clarifying From:, Date:, and Subject: lines at the start of
your message are allowed, though, and can be useful when forwarding
patches from someone else.
> +++ b/builtin/checkout.c
> @@ -536,7 +536,9 @@ static void update_refs_for_switch(struct
> checkout_opts *opts,
> new->name);
> else
> fprintf(stderr, "Switched to%s branch '%s'\n",
> - opts->branch_exists ? " and reset" : " a new",
> + opts->branch_exists
> + ? " and reset"
> + : opts->new_branch ? " a new" : "",
Maybe it would be clearer to write
opts->new_branch ? " a new"
: opts->branch_exists ? " and reset"
: "",
to emphasize that this is a list of condition/result pairs?
The functionality of your patch is obviously good. Thanks.
Jonathan
next prev parent reply other threads:[~2010-08-18 9:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-18 8:28 [PATCH] Do not display 'Switched to a new branch' when the branch existed Knittl
2010-08-18 8:38 ` [PATCH re-roll] " Knittl
2010-08-18 9:16 ` Jonathan Nieder [this message]
2010-08-18 13:39 ` Tay Ray Chuan
[not found] ` <AANLkTimU75krdgQFvw0fEvAPqJb-eKaPXHg_5Hv2A8wh@mail.gmail.com>
2010-08-19 3:21 ` Tay Ray Chuan
2010-08-24 6:50 ` Knittl
2010-08-24 13:06 ` Tay Ray Chuan
2010-08-25 11:51 ` Knittl
2010-08-18 20:59 ` Junio C Hamano
2010-08-18 23:38 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100818091603.GA6263@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=knittl89@googlemail.com \
--cc=rctay89@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).