Hello,
I have noticed that 'stg add FILE' works differently from 'git add
FILE' when file is a symlink to the directory: StGIT adds the contents
of dir, while GIT adds the symlink itself.
In stgit/git.py we see:
> def add(names):
> """Add the files or recursively add the directory contents
> """
> # generate the file list
> files = []
> for i in names:
> if not os.path.exists(i):
> raise GitException, 'Unknown file or directory: %s' % i
>
> if os.path.isdir(i):
> # recursive search. We only add files
> for root, dirs, local_files in os.walk(i):
> for name in [os.path.join(root, f) for f in local_files]:
> if os.path.isfile(name):
> files.append(os.path.normpath(name))
> elif os.path.isfile(i):
> files.append(os.path.normpath(i))
> else:
> raise GitException, '%s is not a file or directory' % i
>
> if files:
> if __run('git-update-index --add --', files):
> raise GitException, 'Unable to add file'
I have no knowledge of Python, so I can't fix it myself, but perhaps
one should check for symlink before 'if os.path.isdir(i):'. This also
will fix 'elif os.path.isfile(i):' branch if 'os.path.normpath(i)'
call dereferences symlinks (I'm not sure if that is the case).
But curious, why does the code traverse the tree itself? Why not to
give the file list directly to git-update-index, and let it decide
what files to add, and how? I also guess the code doesn't honor
.gitignore.
Could 'names' list be passed to git-update-index directly?
--
Tomash Brechko
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html