From: Christian Schlack <redacted>
Date: Thu, 17 Sep 2020 15:27:38 +0000 (+0000)
Subject: remote: don't show success message when set-head fails
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5a07c6c3c2723297f1fbf18e3abcf0cd26e02293;p=git.git

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

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/builtin/remote.c b/builtin/remote.c
index e8377994e5..90ab40a152 100644
--- 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);
 	}