From 38be0d13830efd2d98281c645c3a60afe05ffece Mon Sep 17 00:00:00 2001 From: Qt by Nokia Date: Wed, 27 Apr 2011 12:05:43 +0200 Subject: Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: 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 896db169ea224deb96c59ce8af800d019de63f12 --- util/harfbuzz/update-harfbuzz | 63 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100755 util/harfbuzz/update-harfbuzz (limited to 'util/harfbuzz') diff --git a/util/harfbuzz/update-harfbuzz b/util/harfbuzz/update-harfbuzz new file mode 100755 index 0000000000..29891b6fe7 --- /dev/null +++ b/util/harfbuzz/update-harfbuzz @@ -0,0 +1,63 @@ +#!/bin/bash + +set -e + +require_clean_work_tree() { + # test if working tree is dirty + git rev-parse --verify HEAD > /dev/null && + git update-index --refresh && + git diff-files --quiet && + git diff-index --cached --quiet HEAD || + die "Working tree is dirty" +} + +branch=master + +if [ $# = 1 ]; then + repo=$1 +elif [ $# = 2 ]; then + repo=$1 + branch=$2 +else + echo "usage: $0 [branch]" + exit 1 +fi + +if [ ! -r $repo/.git ]; then + echo "The provided path $repo does not point to a git repository." + exit 2 +fi + +test -z "$(git rev-parse --show-cdup)" || { + exit=$? + echo >&2 "You need to run this command from the toplevel of the working tree." + exit $exit +} + +require_clean_work_tree + +url=`git --git-dir=$repo/.git config remote.origin.url` + +git ls-files src/3rdparty/harfbuzz | git update-index --force-remove --stdin + +git fetch $repo $branch + +commit=`git rev-parse FETCH_HEAD` +tree=`git cat-file commit FETCH_HEAD|grep "^tree" | awk '{print $2}'` + +git read-tree --prefix=src/3rdparty/harfbuzz $tree + +git checkout src/3rdparty/harfbuzz + +git status + +cat >commitlog.txt <