From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Apr 2022 17:56:22 +0000 (-0700)
Subject: Merge branch 'gc/branch-recurse-submodules-fix'
X-Git-Tag: v2.36.0-rc0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da95e25656690e4b585b73677e9db746bd796a67;p=thirdparty%2Fgit.git

Merge branch 'gc/branch-recurse-submodules-fix'

A handful of obvious clean-ups around a topic that is already in
'master'.

* gc/branch-recurse-submodules-fix:
  branch.c: simplify advice-and-die sequence
  branch: rework comments for future developers
  branch: remove negative exit code
  branch --set-upstream-to: be consistent when advising
  branch: give submodule updating advice before exit
  branch: support more tracking modes when recursing
---

da95e25656690e4b585b73677e9db746bd796a67
diff --cc branch.c
index 6b31df539a,b673143cbe..581afd634d
--- a/branch.c
+++ b/branch.c
@@@ -385,14 -383,12 +388,12 @@@ static void dwim_branch_start(struct re
  	real_ref = NULL;
  	if (get_oid_mb(start_name, &oid)) {
  		if (explicit_tracking) {
- 			if (advice_enabled(ADVICE_SET_UPSTREAM_FAILURE)) {
- 				error(_(upstream_missing), start_name);
- 				advise(_(upstream_advice));
- 				exit(1);
- 			}
- 			die(_(upstream_missing), start_name);
+ 			int code = die_message(_(upstream_missing), start_name);
+ 			advise_if_enabled(ADVICE_SET_UPSTREAM_FAILURE,
+ 					  _(upstream_advice));
+ 			exit(code);
  		}
 -		die(_("Not a valid object name: '%s'."), start_name);
 +		die(_("not a valid object name: '%s'"), start_name);
  	}
  
  	switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref, 0)) {