summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@google.com>2023-11-01 10:35:30 -0400
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-11-13 18:21:31 +0000
commit560a79727f5c9ec9ff16544159b444eeb42295ee (patch)
tree217cf3fb5869078e2d336a3df3dad373d935d34e
parent8a6d1724d9d9f4598d15338be9723542ba79467e (diff)
downloadgit-repo-560a79727f5c9ec9ff16544159b444eeb42295ee.tar.gz
repo: Use the worktree when checking the repo rev.
Avoids treating the operation as if it were acting on a bare repository, thereby triggering failures when the Git client is configured with `safe.bareRepository=explicit`. Repo doesn't actually use a bare repository, but pointing at the gitdir acts as if it had. Bug: 307559774 Change-Id: I2c142275b2726a59526729c0b2c54faf728f125d Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/391554 Commit-Queue: Jason R. Coombs <jaraco@google.com> Tested-by: Jason R. Coombs <jaraco@google.com> Tested-by: Emily Shaffer <emilyshaffer@google.com> Reviewed-by: Emily Shaffer <emilyshaffer@google.com> Reviewed-by: Mike Frysinger <vapier@google.com>
-rw-r--r--subcmds/init.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/subcmds/init.py b/subcmds/init.py
index 44517877..e53d0338 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -353,7 +353,7 @@ to update the working directory files.
353 wrapper = Wrapper() 353 wrapper = Wrapper()
354 try: 354 try:
355 remote_ref, rev = wrapper.check_repo_rev( 355 remote_ref, rev = wrapper.check_repo_rev(
356 rp.gitdir, 356 rp.worktree,
357 opt.repo_rev, 357 opt.repo_rev,
358 repo_verify=opt.repo_verify, 358 repo_verify=opt.repo_verify,
359 quiet=opt.quiet, 359 quiet=opt.quiet,