[BUG] git cvsexportcommit -W

[BUG] git cvsexportcommit -W

[Reto Glauser]

I followed a tutorial about bi-directional git-cvs usage:

http://blogs.frugalware.org/vmiklos/2008/06/14/new_in_git_1_5_6_git_cvsexportcommit_w?blog=7&c=1&page=1&more=1&title=new_in_git_1_5_6_git_cvsexportcommit_w&tb=1&pb=1&disp=single

The new git cvsexportcommit option '-W' allows to use the same directory
for a CSV checkout and git checkout. But it doesn't work with the
autocommit feature '-c':

# git cvsexportcommit -v -W -c -p -u 65f12da
Resetting to 88de7d44a6d6343077645fb43b63e3f2907d6fdd
Applying to CVS commit 65f12da1b98c5a3546356a8c42b6aff005531cd7 from parent
88de7d44a6d6343077645fb43b63e3f2907d6fdd
Checking if patch will apply
Applying
Patch applied successfully. Adding new files and directories to CVS
Commit to CVS
Patch title (first comment line): add content to file4
Autocommit
  cvs commit -F .msg 'file4'
Committed successfully to CVS
HEAD is now at 65f12da... add content to file4

Now, even though everything looks OK, the CVS is not up-to-date. Removing
the autocommit feature (-c) reveals the problem:

# git cvsexportcommit -v -W -p -u 65f12da
Resetting to 88de7d44a6d6343077645fb43b63e3f2907d6fdd
Applying to CVS commit 65f12da1b98c5a3546356a8c42b6aff005531cd7 from parent
88de7d44a6d6343077645fb43b63e3f2907d6fdd
Checking if patch will apply
Applying
Patch applied successfully. Adding new files and directories to CVS
Commit to CVS
Patch title (first comment line): add content to file4
Ready for you to commit, just run:

   cvs commit -F .msg 'file4'
HEAD is now at 65f12da... add content to file4

Now, 

# cvs commit -F .msg 'file4'

doesn't do anything (but return value is 0).

You need to use '-f' to force the update:

# cvs commit -f -F .msg 'file4'
/tmp/CVS/project1/file4,v  <--  file4
new revision: 1.2; previous revision: 1.1

I'm using git-1.6.3.1.