x/deb-python-tempest-lib
Code Issues Proposed changes

Merge "Fix migrate_from_tempest script to work with multiple files"

Browse Source
This commit is contained in:
Jenkins
2015-01-26 20:03:49 +00:00
committed by Gerrit Code Review
parent 3efd9acb1a c473cda72f
commit ffd91e2111
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/migrate_from_tempest.sh
View File

@@ -46,11 +46,14 @@ function count_commits {
git clone $TEMPEST_GIT_URL $tmpdir git clone $TEMPEST_GIT_URL $tmpdir
cd $tmpdir cd $tmpdir
# get only commits that touch our files for file in $files; do
commits="$(git log --format=format:%h --no-merges --follow -- $files)" # get only commits that touch our files
# then their merge commits - which works fina since we merge commits commits="$commits $(git log --format=format:%h --no-merges --follow -- $file)"
# individually. # then their merge commits - which works fina since we merge commits
merge_commits="$(git log --format=format:%h --merges --first-parent -- $files)" # individually.
merge_commits="$merge_commits $(git log --format=format:%h --merges --first-parent -- $file)"
done
pattern="\n$(echo $commits $merge_commits | sed -e 's/ /\\|/g')" pattern="\n$(echo $commits $merge_commits | sed -e 's/ /\\|/g')"
# order them by filtering each one in the order it appears on rev-list # order them by filtering each one in the order it appears on rev-list