remote: don't show success message when set-head fails

cschlack · gitster · commit 5a07c6c3c272 · 2020-09-17T11:40:17.000-07:00
Suppress the message 'origin/HEAD set to master' in case of an error.

  $ git remote set-head origin -a
  error: Not a valid ref: refs/remotes/origin/master
  origin/HEAD set to master

Signed-off-by: Christian Schlack &lt;christian@backhub.co&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/remote.c b/builtin/remote.c
@@ -1355,7 +1355,7 @@ static int set_head(int argc, const char **argv)
 			result |= error(_("Not a valid ref: %s"), buf2.buf);
 		else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
 			result |= error(_("Could not setup %s"), buf.buf);
-		if (opt_a)
+		else if (opt_a)
 			printf("%s/HEAD set to %s\n", argv[0], head_name);
 		free(head_name);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1355,7 +1355,7 @@ static int set_head(int argc, const char **argv)`
`1355`	`1355`	`result \|= error(_("Not a valid ref: %s"), buf2.buf);`
`1356`	`1356`	`else if (create_symref(buf.buf, buf2.buf, "remote set-head"))`
`1357`	`1357`	`result \|= error(_("Could not setup %s"), buf.buf);`
`1358`		`- if (opt_a)`
	`1358`	`+ else if (opt_a)`
`1359`	`1359`	`printf("%s/HEAD set to %s\n", argv[0], head_name);`
`1360`	`1360`	`free(head_name);`
`1361`	`1361`	`}`