[PATCH] Be tolerant to repos without .git/remotes/ or .git/branches/.

Yann Dirson· Feb 2, 2007, 23:00 UTC · lore

__remotes_from_dir() was not robust against non-existent dirs. This a Git 1.5 compat issue, since repos do not have .git/remotes any more.

Signed-off-by: Yann Dirson <ydirson@altern.org>
---

This problem prevented me from seeing the t1200 regression you reported, but once this one is fixed I do hit a problem there.

 stgit/git.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Show changes to stgit/git.py +5 −1

diff --git a/stgit/git.py b/stgit/git.py
index 022d607..069833d 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -904,7 +904,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))
+    absdir=os.path.join(basedir.get(), dir)
+    if os.path.isdir(absdir):
+        return os.listdir(absdir)
+    else:
+        return []
 
 def remotes_list():
     """Return the list of remotes in the repository

Catalin Marinas· Feb 2, 2007, 23:03 UTC · re: Yann Dirson · lore

Re: [PATCH] Be tolerant to repos without .git/remotes/ or .git/branches/.

On 02/02/07, Yann Dirson <ydirson@altern.org> wrote:

> __remotes_from_dir() was not robust against non-existent dirs.
> This a Git 1.5 compat issue, since repos do not have .git/remotes any
> more.

I already included the same patch from Pavel Roskin.

-- 
Catalin

patchBe tolerant to repos without .git/remotes/ or .git/branches/.