From 861cb6f02c91b66cdec572dd443ae947e795824a Mon Sep 17 00:00:00 2001 From: "Tommy M. McGuire" Date: Fri, 10 Jun 2005 01:27:47 -0500 Subject: [PATCH] [PATCH] git cvsimport sanity checking This patch adds some sanity checking to git-cvsimport-script, specifically forcing the use of cvsps -x (to get the latest information from the repository, rather than whatever is in the cache) and aborting early if cvsps does not produce any output. I debated removing the $MODULE directory following an abort, but I eventually decided leaving stuff behind would make debugging easier. On the other hand, this patch should help with the "cvsimport left me with an empty repository" complaints. Call cvsps with the -x flag, to get the current state of the repository, and abort the cvs import early if cvsps does not produce any output. Signed-off-by: Tommy McGuire Signed-off-by: Linus Torvalds --- git-cvsimport-script | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-cvsimport-script b/git-cvsimport-script index 936ed8837e..6cd21fae1d 100755 --- a/git-cvsimport-script +++ b/git-cvsimport-script @@ -20,6 +20,8 @@ cvsps -h 2>&1 | grep -q "cvsps version 2.1" >& /dev/null || { mkdir "$MODULE" || exit 1 cd "$MODULE" -TZ=UTC cvsps -A $MODULE | git-cvs2git $ARGS --cvsroot="$CVSROOT" --module="$MODULE" > .git-create-script || exit 1 +TZ=UTC cvsps -x -A $MODULE > .git-cvsps-result +[ -s .git-cvsps-result ] || exit 1 +git-cvs2git $ARGS --cvsroot="$CVSROOT" --module="$MODULE" < .git-cvsps-result > .git-create-script || exit 1 sh .git-create-script