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

[PATCH 1/5] branch: trivial style fix

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Sep 14, 2013, 06:38 UTC
Message-ID
<1379140717-12940-2-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1379140717-12940-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 0836890..c5aa0ba 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -968,9 +968,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 2 of 6 in “Trivial cleanups”
  1. 0/5 Trivial cleanupsFelipe Contreras, Sep 14, 2013
  2. 1/5 branch: trivial style fixFelipe Contreras, Sep 14, 2013
  3. 2/5 sha1-name: trivial style cleanupFelipe Contreras, Sep 14, 2013
  4. 3/5 merge: simplify ff-only optionFelipe Contreras, Sep 14, 2013
  5. 4/5 t: replace pulls with mergesFelipe Contreras, Sep 14, 2013
  6. 5/5 pull: cleanup documentationFelipe Contreras, Sep 14, 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.