diff options
| author | Tommy M. McGuire <mcguire@crsr.net> | 2005-06-10 01:27:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-12 20:48:18 -0700 |
| commit | 861cb6f02c91b66cdec572dd443ae947e795824a (patch) | |
| tree | 9632dd3b30e00d259c687cde04230927626ace0e | |
| parent | 667628d97a5baf18ffa0c701cab6d00e7d812741 (diff) | |
| download | git-861cb6f02c91b66cdec572dd443ae947e795824a.tar.gz git-861cb6f02c91b66cdec572dd443ae947e795824a.tar.xz | |
[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 <mcguire@crsr.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rwxr-xr-x | git-cvsimport-script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-cvsimport-script b/git-cvsimport-script index 936ed8837..6cd21fae1 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 |