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

[PATCH 08/20] branch: trivial style fix

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Oct 12, 2013, 07:07 UTC
Message-ID
<1381561636-20717-5-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1381561636-20717-1-git-send-email-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 builtin/branch.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index ad0f86d..5696cf0 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -975,9 +975,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 			die(_("no such branch '%s'"), argv[0]);
 		}
 
-		if (!branch_has_merge_config(branch)) {
+		if (!branch_has_merge_config(branch))
 			die(_("Branch '%s' has no upstream information"), branch->name);
-		}
 
 		strbuf_addf(&buf, "branch.%s.remote", branch->name);
 		git_config_set_multivar(buf.buf, NULL, NULL, 1);
-- 
1.8.4-fc
Previous: Felipe ContrerasNext: Felipe Contreras
Message 5 of 26 in “doc: git-foo was obsoleted several years ago”
  1. 10/20 doc: git-foo was obsoleted several years agoFelipe Contreras, Oct 12, 2013
  2. 00/20 Trivial pachesFelipe Contreras, Oct 12, 2013
  3. 03/20 pull: cleanup documentationFelipe Contreras, Oct 12, 2013
  4. 20/20 add: avoid yoda conditionsFelipe Contreras, Oct 12, 2013
  5. 08/20 branch: trivial style fixFelipe Contreras, Oct 12, 2013
  6. 15/20 pretty: trivial style fixFelipe Contreras, Oct 12, 2013
  7. 19/20 setup: trivial style fixesFelipe Contreras, Oct 12, 2013
  8. 13/20 transport-helper: trivial style fixFelipe Contreras, Oct 12, 2013
  9. 01/20 merge: simplify ff-only optionFelipe Contreras, Oct 12, 2013
  10. 16/20 revision: trivial style fixesFelipe Contreras, Oct 12, 2013
  11. Stefan BellerOct 12, 2013
  12. Felipe ContrerasOct 12, 2013
  13. 17/20 diff: trivial style fixFelipe Contreras, Oct 12, 2013
  14. 05/20 remote: fix trivial memory leakFelipe Contreras, Oct 12, 2013
  15. 07/20 shortlog: add missing declarationFelipe Contreras, Oct 12, 2013
  16. 11/20 symbolic-ref: trivial style fixFelipe Contreras, Oct 12, 2013
  17. 06/20 revision: add missing includeFelipe Contreras, Oct 12, 2013
  18. 18/20 run-command: trivial style fixesFelipe Contreras, Oct 12, 2013
  19. 02/20 t: replace pulls with mergesFelipe Contreras, Oct 12, 2013
  20. 12/20 alias: trivial style fixFelipe Contreras, Oct 12, 2013
  21. Stefan BellerOct 12, 2013
  22. Jonathan NiederOct 14, 2013
  23. Felipe ContrerasOct 14, 2013
  24. 04/20 fetch: add missing documentationFelipe Contreras, Oct 12, 2013
  25. 09/20 sha1-name: trivial style cleanupFelipe Contreras, Oct 12, 2013
  26. 14/20 describe: trivial style fixesFelipe Contreras, Oct 12, 2013

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.