[PATCH] Allow .git/branches and .git/remotes to be missing
From: Pavel Roskin <hidden>
Date: 2016-06-15 22:42:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Pavel Roskin <redacted> Both directories are now obsoleted by .git/config file. This fixes "make test" in StGIT with git 1.5.0-rc3. Signed-off-by: Pavel Roskin <redacted> --- stgit/git.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/stgit/git.py b/stgit/git.py
index c7cc6a7..553a6bf 100644
--- a/stgit/git.py
+++ b/stgit/git.py@@ -908,7 +908,11 @@ def __remotes_from_config(): return config.sections_matching(r'remote\.(.*)\.url') def __remotes_from_dir(dir): - return os.listdir(os.path.join(basedir.get(), dir)) + d = os.path.join(basedir.get(), dir) + if os.path.exists(d): + return os.listdir(d) + else: + return None def remotes_list(): """Return the list of remotes in the repository
--
Regards,
Pavel Roskin