From: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
To: git@vger.kernel.org, gitster@pobox.com
Cc: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
Subject: [PATCH 0/5] provide better error messages for @{upstream}
Date: Wed, 11 Apr 2012 18:17:10 +0200 [thread overview]
Message-ID: <1334161035-26355-1-git-send-email-zbyszek@in.waw.pl> (raw)
Hi,
this is a small patch series to provide better error messages when
'@{u}' in various forms is used. Patches are really tiny, and 2-5/5
could probably be squashed together, but this way the individual
changes should be more readable.
The idea is to provide as much information as possible for the user
when @{u} cannot be resolved successfully. The following cases are
distinguished:
- branch@{u} on a branch with
* no upstream,
* on a branch with a configured upstream, but when a branch is not
in remote.<remote>.fetch
- branch@{u} when branch 'branch' does not exist
- @{u} without the branch name (current branch name is used)
Zbigniew Jędrzejewski-Szmek (5):
t1507: add additional tests for @{upstream}
Provide branch name in error message when using @{u}
Provide better message for barnhc_wiht_tpyo@{u}
Be more specific if upstream branch is not fetched
i18n: mark @{upstream} error messages for translation
sha1_name.c | 20 ++++++++---
t/t1507-rev-parse-upstream.sh | 82 +++++++++++++++++++++++++++++++++++++++++--
2 files changed, 95 insertions(+), 7 deletions(-)
--
1.7.10.344.g387ed
next reply other threads:[~2012-04-11 16:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 16:17 Zbigniew Jędrzejewski-Szmek [this message]
2012-04-11 16:17 ` [PATCH 1/5] t1507: add additional tests for @{upstream} Zbigniew Jędrzejewski-Szmek
2012-04-11 17:52 ` Junio C Hamano
2012-04-11 17:57 ` Junio C Hamano
2012-04-11 21:51 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 17:59 ` Matthieu Moy
2012-04-11 22:05 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 2/5] Provide branch name in error message when using @{u} Zbigniew Jędrzejewski-Szmek
2012-04-11 18:00 ` Junio C Hamano
2012-04-11 22:13 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 3/5] Provide better message for barnhc_wiht_tpyo@{u} Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 4/5] Be more specific if upstream branch is not fetched Zbigniew Jędrzejewski-Szmek
2012-04-12 5:30 ` Jeff King
2012-04-12 9:15 ` Zbigniew Jędrzejewski-Szmek
2012-04-12 15:15 ` Junio C Hamano
2012-04-12 20:40 ` Jeff King
2012-04-14 7:54 ` [PATCH v2 0/5] provide better error messages for @{upstream} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 1/5] t1507: add tests to document @{upstream} behaviour Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 2/5] Provide branch name in error message when using @{u} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 3/5] Provide better message for barnhc_wiht_tpyo@{u} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 4/5] Be more specific if upstream branch is not tracked Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 5/5] i18n: mark @{upstream} error messages for translation Zbigniew Jędrzejewski-Szmek
2012-04-14 8:09 ` [PATCH v2 0/5] provide better error messages for @{upstream} Jeff King
2012-04-11 16:17 ` [PATCH 5/5] i18n: mark @{upstream} error messages for translation Zbigniew Jędrzejewski-Szmek
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=1334161035-26355-1-git-send-email-zbyszek@in.waw.pl \
--to=zbyszek@in.waw.pl \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).