From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Nov 2023 07:53:14 +0000 (+0900)
Subject: Merge branch 'ds/scalar-updates' into maint-2.42
X-Git-Tag: v2.42.1~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50758312f2d29a32858ccd25b24ea64ae8a04cb1;p=thirdparty%2Fgit.git

Merge branch 'ds/scalar-updates' into maint-2.42

Scalar updates.

* ds/scalar-updates:
  scalar reconfigure: help users remove buggy repos
  setup: add discover_git_directory_reason()
  scalar: add --[no-]src option
---

50758312f2d29a32858ccd25b24ea64ae8a04cb1
diff --cc setup.c
index 18927a847b,a5938fdc59..2e607632db
--- a/setup.c
+++ b/setup.c
@@@ -1429,11 -1409,16 +1418,11 @@@ enum discovery_result discover_git_dire
  		strbuf_setlen(commondir, commondir_offset);
  		strbuf_setlen(gitdir, gitdir_offset);
  		clear_repository_format(&candidate);
- 		return -1;
+ 		return GIT_DIR_INVALID_FORMAT;
  	}
  
 -	/* take ownership of candidate.partial_clone */
 -	the_repository->repository_format_partial_clone =
 -		candidate.partial_clone;
 -	candidate.partial_clone = NULL;
 -
  	clear_repository_format(&candidate);
- 	return 0;
+ 	return result;
  }
  
  const char *setup_git_directory_gently(int *nongit_ok)