git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/5] provide better error messages for @{upstream}

From
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date
Apr 11, 2012, 16:17 UTC
Message-ID
<1334161035-26355-1-git-send-email-zbyszek@in.waw.pl>
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: Zbigniew Jędrzejewski-Szmek
Message 1 of 24 in “provide better error messages for @{upstream}”
  1. 0/5 provide better error messages for @{upstream}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  2. 1/5 t1507: add additional tests for @{upstream}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  3. Junio C HamanoApr 11, 2012
  4. Junio C HamanoApr 11, 2012
  5. Zbigniew Jędrzejewski-SzmekApr 11, 2012
  6. Matthieu MoyApr 11, 2012
  7. Zbigniew Jędrzejewski-SzmekApr 11, 2012
  8. 2/5 Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  9. Junio C HamanoApr 11, 2012
  10. Zbigniew Jędrzejewski-SzmekApr 11, 2012
  11. 3/5 Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  12. 4/5 Be more specific if upstream branch is not fetchedZbigniew Jędrzejewski-Szmek, Apr 11, 2012
  13. Jeff KingApr 12, 2012
  14. Zbigniew Jędrzejewski-SzmekApr 12, 2012
  15. Junio C HamanoApr 12, 2012
  16. Jeff KingApr 12, 2012
  17. 0/5 provide better error messages for @{upstream}Zbigniew Jędrzejewski-Szmek, Apr 14, 2012
  18. 1/5 t1507: add tests to document @{upstream} behaviourZbigniew Jędrzejewski-Szmek, Apr 14, 2012
  19. 2/5 Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek, Apr 14, 2012
  20. 3/5 Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek, Apr 14, 2012
  21. 4/5 Be more specific if upstream branch is not trackedZbigniew Jędrzejewski-Szmek, Apr 14, 2012
  22. 5/5 i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek, Apr 14, 2012
  23. Jeff KingApr 14, 2012
  24. 5/5 i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek, Apr 11, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.