diff options
| -rw-r--r-- | misc/import-commit-msg | 2 | ||||
| -rwxr-xr-x | modularize | 9 | ||||
| -rw-r--r-- | scripts/905_git_split | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/misc/import-commit-msg b/misc/import-commit-msg index cb8aea5..0f6b1a4 100644 --- a/misc/import-commit-msg +++ b/misc/import-commit-msg @@ -10,3 +10,5 @@ http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. + +Branched from the monolithic repo, Qt master branch, at commit @@ -589,9 +589,14 @@ if ($commit_changes) { print "Committing all changes done by the modularization script\n"; run("git add ."); if ($zeroMoveGraft) { - run("git commit -a -F $basepath/misc/import-commit-msg --author \"Qt by Nokia <qt-info\@nokia.com>\" -q"); + # run("git commit -a -F $basepath/misc/import-commit-msg --author \"Qt by Nokia <qt-info\@nokia.com>\" -q"); + my $GIT_COMMIT; + open(GIT_COMMIT, "| git commit -a -q --author \"Qt by Nokia <qt-info\@nokia.com>\" -F -") or die "Couldn't fork: $!\n";; + print GIT_COMMIT fileContents("$basepath/misc/import-commit-msg") . $good_sha1; + close(GIT_COMMIT) or die "Couldn't close: $!\n";; } else { - run("git commit -a -m \"Commit of all changes done by the modularization script\" -q"); + run("git commit -a -q -m \"Commit of all changes done by the modularization script" . + "\nBranched from monolithic repo, Qt master branch, at commit\n$good_sha1\""); } } diff --git a/scripts/905_git_split b/scripts/905_git_split index 2b535c4..c1b9007 100644 --- a/scripts/905_git_split +++ b/scripts/905_git_split @@ -71,7 +71,11 @@ sub produceModule chdir("$repos_base/$module"); run("git init . -q"); run("git add -f ."); - run("git commit -F $basepath/misc/import-commit-msg --author \"Qt by Nokia <qt-info\@nokia.com>\" -q"); + #run("git commit -F $basepath/misc/import-commit-msg --author \"Qt by Nokia <qt-info\@nokia.com>\" -q"); + my $GIT_COMMIT; + open(GIT_COMMIT, "| git commit -q --author \"Qt by Nokia <qt-info\@nokia.com>\" -F -") or die "Couldn't fork: $!\n";; + print GIT_COMMIT fileContents("$basepath/misc/import-commit-msg") . $good_sha1; + close(GIT_COMMIT) or die "Couldn't close: $!\n";; } sub produceZeroMoveModule |