[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Bug 41803: Add some developer tools for working on tor-browser.

[ma1 (@ma1)]

ma1 pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
89a5a7fd by hackademix at 2024-04-15T11:52:47+02:00
fixup! Bug 41803: Add some developer tools for working on tor-browser.

Bug 42516: Make tb-dev worktree-compatible

- - - - -


1 changed file:

- tools/torbrowser/tb-dev


Changes:

=====================================
tools/torbrowser/tb-dev
=====================================
@@ -57,10 +57,12 @@ def get_local_root():
     global local_root
     if local_root is None:
         try:
+            # Make sure we have a matching remote in this git repository. Should raise Exception if we don't.
+            get_upstream_name()
             git_root = git_get(["rev-parse", "--show-toplevel"])[0]
-        except subprocess.CalledProcessError:
+        except Exception:
             git_root = None
-        if git_root is None or os.path.basename(git_root) != "tor-browser":
+        if git_root is None:
             local_root = ""
         else:
             local_root = git_root



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/89a5a7fd311640a4b50b951bcf8ef1b035aa37bb

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/89a5a7fd311640a4b50b951bcf8ef1b035aa37bb
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240415/d489be7e/attachment-0001.htm>