From: Sven Verdoolaege Date: Fri, 17 Jun 2005 16:26:57 GMT Subject: Re: [PATCH] support incremental cvs2git-ing Message-ID: <20050617162657.GG9986MdfPADPa@garage.linux.student.kuleuven.ac.be> In-Reply-To: <20050610193519.GA28628@lumumba.luc.ac.be> On Fri, Jun 10, 2005 at 09:35:19PM +0200, Panagiotis Issaris wrote: > Hi Linus, > > I wanted to be able to track CVS repositories in a GIT repository. The > cvs2git program worked fine with the initial import but needed a tiny > modification to enable me to resync the GIT repository with the updated > CVS tree. > The original version of this patch failed to track the correct branch on the first new commit. Fixed and tested patch below. skimo -- cvs2git.c: support incremental conversion Add -u option to indicate incremental conversion. Signed-off-by: Panagiotis Issaris Signed-off-by: Sven Verdoolaege --- commit 67fcd1648f66d04972c90860b58449f586718653 tree 698e9c37f91c88c797cab7324d69106b898987a3 parent 4fd62062eb2d52d32cb771feb05bf1ee29d760f9 author Panagiotis Issaris Fri, 17 Jun 2005 18:30:27 +0200 committer Sven Verdoolaege Fri, 17 Jun 2005 18:30:27 +0200 cvs2git.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cvs2git.c b/cvs2git.c --- a/cvs2git.c +++ b/cvs2git.c @@ -28,11 +28,17 @@ static int verbose = 0; * Usage: * * TZ=UTC cvsps -A | - * cvs2git --cvsroot=[root] --module=[module] > script + * git-cvs2git --cvsroot=[root] --module=[module] > script * * Creates a shell script that will generate the .git archive of * the names CVS repository. * + * TZ=UTC cvsps -s 1234- -A | + * git-cvs2git -u --cvsroot=[root] --module=[module] > script + * + * Creates a shell script that will update the .git archive with + * CVS changes from patchset 1234 until the last one. + * * IMPORTANT NOTE ABOUT "cvsps"! This requires version 2.1 or better, * and the "TZ=UTC" and the "-A" flag is required for sane results! */ @@ -230,6 +236,10 @@ int main(int argc, char **argv) verbose = 1; continue; } + if (!strcmp(arg, "-u")) { + initial_commit = 0; + continue; + } } @@ -241,11 +251,13 @@ int main(int argc, char **argv) exit(1); } - printf("[ -d .git ] && exit 1\n"); - printf("git-init-db\n"); - printf("mkdir -p .git/refs/heads\n"); - printf("mkdir -p .git/refs/tags\n"); - printf("ln -sf refs/heads/master .git/HEAD\n"); + if (initial_commit) { + printf("[ -d .git ] && exit 1\n"); + printf("git-init-db\n"); + printf("mkdir -p .git/refs/heads\n"); + printf("mkdir -p .git/refs/tags\n"); + printf("ln -sf refs/heads/master .git/HEAD\n"); + } while (fgets(line, sizeof(line), stdin) != NULL) { int linelen = strlen(line);