Create specification for grafts file.

[invirt/scripts/git-migration.git] / git-migrate

diff --git a/git-migrate b/git-migrate
index f3ef98e..f10a512 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -24,6 +24,16 @@ def clonePackage(base, pkg):
         shutil.rmtree(pkg)
         subprocess.check_call(['git', 'config', 'core.bare', 'true'],
                               cwd='%s.git' % pkg)
         shutil.rmtree(pkg)
         subprocess.check_call(['git', 'config', 'core.bare', 'true'],
                               cwd='%s.git' % pkg)

+        
+    # Some of these repos have a rev where everything was deleted
+    # as a result of the move. We don't want that rev to exist.
+    p = subprocess.Popen(['git', 'ls-files'],
+                         cwd='%s.git' % pkg,
+                         stdout=subprocess.PIPE)
+    p.wait()
+    if len(p.stdout.read()) == 0:
+        subprocess.check_call(['git', 'reset', 'HEAD^'],
+                              cwd='%s.git' % pkg)

 
 def cloneAllPackages(base):
     for pkg in open('package-list'):
 
 def cloneAllPackages(base):
     for pkg in open('package-list'):