Merge branch 'ds/scalar-updates'

Scalar updates.

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

diff --cc scalar.c
Simple merge

diff --cc setup.c
index 18927a847b86bbde543ba5ba539269c9b4e323f1,a5938fdc5956e057e3c39f945a08f24daa552679..2e607632dbde807ae76566e282d8f122b1642cda
--- 1/setup.c
--- 2/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)

diff --cc setup.h
Simple merge