Hi Junichi, On Fri, May 11, 2007 at 06:39:27PM +0900, Junichi Uekawa wrote: > git-buildpackage does not seem to like directories being removed from > upstream tarballs. > > test-case attached
I unpacked the tarball and changed to work/vvv, then: $ git-import-orig -u 2 ../../upstream/vvv-2.tar.gz Upstream version is 2 Importing ../../upstream/vvv-2.tar.gz to upstream branch... Already on branch "upstream" master * upstream VCSCMD: git fatal: pathspec 'dir/' did not match any files Traceback (most recent call last): File "/usr/bin/git_load_dirs", line 25, in ? init.run("git") File "/usr/lib/python2.4/site-packages/vcs_support/init.py", line 72, in run iobj.main() File "/usr/lib/python2.4/site-packages/vcs_support/vcs_interact.py", line 155, in main self.catchup(needsupdate) File "/usr/lib/python2.4/site-packages/vcs_support/vcs_interact.py", line 169, in catchup self.delfile(file) File "/usr/lib/python2.4/site-packages/vcs_support/vcs_interact.py", line 206, in delfile self.wcobj.deltag(file) File "/usr/lib/python2.4/site-packages/vcs_support/vcs_wc.py", line 134, in deltag cmd().delete + [file]) File "/usr/lib/python2.4/site-packages/vcs_support/util.py", line 110, in chdircmd return apply(func, args, kwargs) File "/usr/lib/python2.4/site-packages/vcs_support/util.py", line 66, in safeexec return checkresult(result, expected) File "/usr/lib/python2.4/site-packages/vcs_support/util.py", line 94, in checkresult raise ExecProblem, info + " (expected exit code %d)" % expected vcs_support.util.ExecProblem: exited with code 128 (expected exit code 0) git_load_dirs returned 1 The problem is in git_load_dirs - empty dirs aren't tracked by git but git_load_dirs tries to remove it via git-rm anyway: # git_load_dirs -v ../../upstream/vvv-2 Running: git ['rm', '-r', 'dirs/'] with the same error. The same happens with dot files btw. John, do you have a good suggestion on how to resolve this? Would you consider checking the exit status of "git-status dir/" to check if it's tracked by git o.k.? Cheers, -- Guido -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]