Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
cvsserver update: comment about how we shouldn't remove a user-modified file
author
Matthew Ogilvie
<mmogilvi_git@miniinfo.net>
Sun, 14 Oct 2012 05:42:17 +0000
(23:42 -0600)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 16 Oct 2012 23:16:22 +0000
(16:16 -0700)
Instead of a comment, we should really add test cases and actually fix it.
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-cvsserver.perl
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
196e48f
)
diff --git
a/git-cvsserver.perl
b/git-cvsserver.perl
index 595865c18a5ef3f9ae0211e7da68f310bf1d3e54..cc39b6bfdd307620f32651a3c73c64d21f370687 100755
(executable)
--- a/
git-cvsserver.perl
+++ b/
git-cvsserver.perl
@@
-1144,6
+1144,10
@@
sub req_update
if ( $meta->{filehash} eq "deleted" )
{
if ( $meta->{filehash} eq "deleted" )
{
+ # TODO: If it has been modified in the sandbox, error out
+ # with the appropriate message, rather than deleting a modified
+ # file.
+
my ( $filepart, $dirpart ) = filenamesplit($filename,1);
$log->info("Removing '$filename' from working copy (no longer in the repo)");
my ( $filepart, $dirpart ) = filenamesplit($filename,1);
$log->info("Removing '$filename' from working copy (no longer in the repo)");