From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: "Carlos Martín Nieto" <cmn@elego•de>
Cc: git@vger•kernel.org, jrnieder@gmail•com, gitster@pobox•com
Subject: Re: [PATCH 2/3] branch: suggest how to undo a --set-upstream when given one branch
Date: Tue, 10 Jul 2012 19:20:23 +0200 [thread overview]
Message-ID: <vpqpq83mt2g.fsf@bauges.imag.fr> (raw)
In-Reply-To: <1341939181-8962-3-git-send-email-cmn@elego.de> ("Carlos Martín Nieto"'s message of "Tue, 10 Jul 2012 18:53:00 +0200")
Carlos Martín Nieto <cmn@elego•de> writes:
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -864,10 +864,32 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
> info and making sure new_upstream is correct */
> create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
> } else if (argc > 0 && argc <= 2) {
> + struct branch *branch = branch_get(argv[0]);
> + const char *old_upstream = NULL;
> + int branch_existed = 0;
> +
> if (kinds != REF_LOCAL_BRANCH)
> die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
> +
> + /* Save what argv[0] was pointing to so we can give
> + the --set-upstream-to hint */
Multi-line comments are usually written in Git as
/*
* multi-line
* comment
*/
> + if (branch_has_merge_config(branch))
> + old_upstream = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
Broken indentation.
> + if (argc == 1) {
> + printf("If you wanted to make '%s' track '%s', do this:\n", head, argv[0]);
Could be marked for translation with _("...").
> + if (branch_existed)
> + printf(" $ git branch --set-upstream '%s' '%s'\n", argv[0], old_upstream);
old_upstream may be NULL at this point. I guess you want to skip this
line if old_upsteam is NULL.
The fact that I could find this bug suggests that this lacks a few new
tests too ;-).
> + else
> + printf(" $ git branch -d '%s'\n", argv[0]);
> +
> + printf(" $ git branch --set-upstream-to '%s'\n", argv[0]);
For the 3 printf()s: we usually display commands without the "$", and
separate them from text with a blank line. See for example what "git
commit" says when you didn't provide authorship:
You can suppress this message by setting them explicitly:
git config --global user.name "Your Name"
git config --global user.email you@example•com
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
(the absence of $ sign avoids the temptation to cut-and-paste it)
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2012-07-10 17:20 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 16:52 [PATCH 0/3] A better way of handling upstream information in git-branch Carlos Martín Nieto
2012-07-10 16:52 ` [PATCH 1/3] branch: introduce --set-upstream-to Carlos Martín Nieto
2012-07-10 17:08 ` Matthieu Moy
2012-07-10 17:26 ` Junio C Hamano
2012-07-10 19:13 ` Jonathan Nieder
2012-07-10 19:49 ` Junio C Hamano
2012-07-10 20:11 ` Jonathan Nieder
2012-07-10 20:49 ` Junio C Hamano
2012-07-10 21:09 ` Jonathan Nieder
2012-07-10 23:13 ` Junio C Hamano
2012-07-10 23:47 ` Jonathan Nieder
2012-07-11 1:20 ` Junio C Hamano
2012-07-11 1:37 ` Jonathan Nieder
2012-07-12 8:41 ` Miles Bader
2012-07-12 16:58 ` Junio C Hamano
2012-07-10 16:53 ` [PATCH 2/3] branch: suggest how to undo a --set-upstream when given one branch Carlos Martín Nieto
2012-07-10 17:20 ` Matthieu Moy [this message]
2012-07-11 13:50 ` Carlos Martín Nieto
2012-07-10 17:40 ` Junio C Hamano
2012-07-11 14:24 ` Carlos Martín Nieto
2012-07-10 19:24 ` Jonathan Nieder
2012-07-10 22:43 ` Junio C Hamano
2012-07-10 23:00 ` Jonathan Nieder
2012-07-11 15:14 ` Carlos Martín Nieto
2012-07-10 16:53 ` [PATCH 3/3] branch: add --unset-upstream option Carlos Martín Nieto
2012-07-10 18:02 ` Junio C Hamano
2012-07-11 14:14 ` Carlos Martín Nieto
2012-07-11 16:53 ` Junio C Hamano
2012-07-12 10:27 ` Carlos Martín Nieto
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=vpqpq83mt2g.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=cmn@elego$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox