vc-git: workaround for "file unregistered" problem

vc-git: workaround for "file unregistered" problem

[David Reitter]

I've been having some problems with git:

In some circumstances, git fails to report the status of files and pretends they are unregistered.  One symptom can be that vc-git will try to add the file a second time.   I have inquired about this on the Git list [1], but received no response - I'm not sure if this is a bug in git.  

Either way, specifying full paths works around the problem, and the patch below does that for those who encounter similar issues.


[1] http://marc.info/?l=git&m=125787684318129&w=2


commit c1285a8335c943f319d1597c4332707b3291f967
Author: David Reitter <david.reitter@gmail.com>
Date:   Tue Nov 10 13:16:30 2009 -0500

    vc-git-registered: temporary workaround for a git not finding files
    git doesn't understand relative path specs in some situations

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index cee3abe..3113c19 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -147,7 +147,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (when (vc-git-root file)
     (with-temp-buffer
       (let* (process-file-side-effects
-            (dir (file-name-directory file))
+            (dir (vc-git-root file))
              (name (file-relative-name file dir))
              (str (ignore-errors
                     (when dir (cd dir))

Re: vc-git: workaround for "file unregistered" problem

[Stefan Monnier]

> In some circumstances, git fails to report the status of files and
> pretends they are unregistered.  One symptom can be that vc-git will
> try to add the file a second time.   I have inquired about this on the
> Git list [1], but received no response - I'm not sure if this is a bug
> in git.

Can you report it as a bug?

> Either way, specifying full paths works around the problem, and the
> patch below does that for those who encounter similar issues.

It looks acceptable, exept that, like all patches which try to work
around a problem, it should come with a corresponding comment.


        Stefan

Re: vc-git: workaround for "file unregistered" problem

[David Reitter]

On Nov 12, 2009, at 10:39 AM, Stefan Monnier wrote:
>> Git list [1], but received no response - I'm not sure if this is a bug
>> in git.
> 
> Can you report it as a bug?

OK, let's see.  The git folks have been very responsive and helpful in the past.

>> Either way, specifying full paths works around the problem, and the
>> patch below does that for those who encounter similar issues.
> 
> It looks acceptable, exept that, like all patches which try to work
> around a problem, it should come with a corresponding comment.

If only I understood the underlying problem better!
I will try to do more research and check this in with an appropriate comment.

Re: vc-git: workaround for "file unregistered" problem

[Stefan Monnier]

>>> Either way, specifying full paths works around the problem, and the
>>> patch below does that for those who encounter similar issues.
>> It looks acceptable, exept that, like all patches which try to work
>> around a problem, it should come with a corresponding comment.
> If only I understood the underlying problem better!
> I will try to do more research and check this in with an appropriate comment.

The comment doesn't need to explain the problem, but it needs to explain
why the code is written the way it is (e.g. "because if we use
a relative name Git seems to sometimes return incorrect data", ideally
even with a reference to the Git bug report).


        Stefan