Fixed 0cad bug with smaller fix.
authorW. Trevor King <wking@drexel.edu>
Thu, 13 Nov 2008 19:31:49 +0000 (14:31 -0500)
committerW. Trevor King <wking@drexel.edu>
Thu, 13 Nov 2008 19:31:49 +0000 (14:31 -0500)
Hubert Chathi's fix was confusing for me, so I made a simpler change.
Seems to work so far.  The problem was that

os.path.dirname('filename')

returns an empty string ('') if there are no directories in the
filename.  So when `git rev-parse --git-dir` returned '.git', os
returned ''.  Later programs didn't recognize '' as a valid directory
and crashed.  My fix returns '.' in this case, so we don't crash,
and avoid having to use full paths.  I'm not sure why I don't want
to use full paths; they just give me bad vibes...

.be/bugs/0cad2ac6-76ef-4a88-abdf-b2e02de76f5c/comments/6a0080c4-d684-4c2c-afaa-c15cc43d68ad/body [new file with mode: 0644]
.be/bugs/0cad2ac6-76ef-4a88-abdf-b2e02de76f5c/comments/6a0080c4-d684-4c2c-afaa-c15cc43d68ad/values [new file with mode: 0644]
.be/bugs/0cad2ac6-76ef-4a88-abdf-b2e02de76f5c/values
libbe/git.py

diff --git a/.be/bugs/0cad2ac6-76ef-4a88-abdf-b2e02de76f5c/comments/6a0080c4-d684-4c2c-afaa-c15cc43d68ad/body b/.be/bugs/0cad2ac6-76ef-4a88-abdf-b2e02de76f5c/comments/6a0080c4-d684-4c2c-afaa-c15cc43d68ad/body
new file mode 100644 (file)
index 0000000..c889a38
--- /dev/null
@@ -0,0 +1 @@
+Fixed with a simpler patch.
diff --git a/.be/bugs/0cad2ac6-76ef-4a88-abdf-b2e02de76f5c/comments/6a0080c4-d684-4c2c-afaa-c15cc43d68ad/values b/.be/bugs/0cad2ac6-76ef-4a88-abdf-b2e02de76f5c/comments/6a0080c4-d684-4c2c-afaa-c15cc43d68ad/values
new file mode 100644 (file)
index 0000000..4a2e108
--- /dev/null
@@ -0,0 +1,21 @@
+
+
+
+Content-type=text/plain
+
+
+
+
+
+
+Date=Thu, 13 Nov 2008 19:31:04 +0000
+
+
+
+
+
+
+From=wking
+
+
+
index 0ae08e0cc7a0ec203619be407b985f3945612709..970523cb9ff9cee325a16be5ba3832d73dd26930 100644 (file)
@@ -15,7 +15,7 @@ severity=minor
 
 
 
-status=open
+status=closed
 
 
 
index 398585f6792119d2e7f6e19f526a8a137717ae39..5c377fd9e1d2b7af21d96ea5c6f9520a2b40fda0 100644 (file)
@@ -102,7 +102,10 @@ def git_repo_for_path(path):
     """Find the root of the deepest repository containing path."""
     # Assume that nothing funny is going on; in particular, that we aren't
     # dealing with a bare repo.
-    return os.path.dirname(git_dir_for_path(path))
+    dirname = os.path.dirname(git_dir_for_path(path))
+    if dirname == '' : # os.path.dirname('filename') == ''
+        dirname = '.'
+    return dirname
 
 def git_dir_for_path(path):
     """Find the git-dir of the deepest repo containing path."""