Merge branch 'cs/don-t-pretend-a-failed-remote-set-head-succeeded'

gitster · gitster · commit 39149df36426 · 2020-09-22T12:36:32.000-07:00
"git remote set-head" that failed still said something that hints
the operation went through, which was misleading.

* cs/don-t-pretend-a-failed-remote-set-head-succeeded:
  remote: don't show success message when set-head fails
diff --git a/builtin/remote.c b/builtin/remote.c
@@ -1356,7 +1356,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
`@@ -1356,7 +1356,7 @@ static int set_head(int argc, const char **argv)`
`1356`	`1356`	`result \|= error(_("Not a valid ref: %s"), buf2.buf);`
`1357`	`1357`	`else if (create_symref(buf.buf, buf2.buf, "remote set-head"))`
`1358`	`1358`	`result \|= error(_("Could not setup %s"), buf.buf);`
`1359`		`- if (opt_a)`
	`1359`	`+ else if (opt_a)`
`1360`	`1360`	`printf("%s/HEAD set to %s\n", argv[0], head_name);`
`1361`	`1361`	`free(head_name);`
`1362`	`1362`	`}`