diff options
| author |   Brian Harring <ferringb@google.com> | 2012-10-16 00:21:07 -0700 |
|---|---|---|
| committer | Brian Harring <ferringb@google.com> | 2012-10-16 13:28:49 -0700 |
| commit | d740be6709ab7ac6a1b271430d650e4381f3f761 (patch) | |
| tree | 61f32e9f96a942891344f5f021ae4052a6ae59c6 /process_directory.sh | |
| parent | ongoing work (diff) | |
| download | git-conversion-tools-d740be6709ab7ac6a1b271430d650e4381f3f761.tar.gz git-conversion-tools-d740be6709ab7ac6a1b271430d650e4381f3f761.tar.bz2 git-conversion-tools-d740be6709ab7ac6a1b271430d650e4381f3f761.zip | |
refactoring; bypass the commit creation in each repo and linearization by git; handle it ourselves
Diffstat (limited to 'process_directory.sh')
| -rwxr-xr-x | process_directory.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/process_directory.sh b/process_directory.sh index 14ef28c..a7be6ed 100755 --- a/process_directory.sh +++ b/process_directory.sh @@ -16,10 +16,12 @@ f() { time cvs2git --options config -vv cd git git init --bare - { "${base}/rewrite-blob-data.py" ../cvs2svn-tmp/git-blob.dat; - cat ../cvs2svn-tmp/git-dump.dat; - } | git fast-import - rm -rf "${final}" git-work + # Note we're only pull in blob data here; this intentional- we need to + # interlace the commit objects together, these git object pools will be + # be used as alternates for the final repo combination. + "${base}/rewrite-blob-data.py" ../cvs2svn-tmp/git-blob.dat | \ + git fast-import --export-marks=../cvs2svn-tmp/git-blob.idx + rm -rf "${final}" cd "$root" mv "$output" "${final}" set +x |