Changeset 1898 for trunk/scripts/git-migration

Timestamp:

Dec 25, 2008, 2:33:38 AM (16 years ago)

Author:

broder

Message:

Use filter-branch to correct the trunk/packages/$package/$package
setup from earlier in the repo history.

Location:

trunk/scripts/git-migration

Files:

• filter-subdirs (added)
• git-migrate (modified) (1 diff)

trunk/scripts/git-migration/git-migrate

@@ -61 +61 @@
     if len(p.stdout.read()) == 0:
         subprocess.check_call(['git', 'reset', '--soft', 'HEAD^'],
+                              cwd='%s.git' % pkg)
+    
+    # Early in the project's history, there were a bunch of double
+    # directory trees - i.e. the source was actually in
+    # trunk/packages/$package/$package. Correct for that
+    cwd = os.getcwd()
+    os.environ['PACKAGE'] = pkg
+    p = subprocess.check_call(['git', 'filter-branch',
+                               '--commit-filter', '%s "$@"' % os.path.join(cwd, 'filter-subdirs'),
+                               '--tag-name-filter', 'cat',
+                               '--',
+                               '--all'],
                               cwd='%s.git' % pkg)