lorikeet-heimdal: specify hash to heimdal import, rather than using the date

diff --git a/apply_heimdal.sh b/apply_heimdal.sh
index 319e4e31c915827f68c156a31ec89b6620ea9b81..1b45dc79064210ec2b7175311954dfb40eb0af91 100755 (executable)
--- a/apply_heimdal.sh
+++ b/apply_heimdal.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-[ $# == 1 ] || {
+[ $# == 2 ] || {
     echo "Usage: apply_heimdal.sh <lorikeet_path>"
     exit 1
 }
 
 LORIKEET_PATH="$1"
-
+IMPORT_HASH="$2"
 S4PATH="$PWD"
 
 pushd $LORIKEET_PATH || exit 1
@@ -34,7 +34,7 @@ try_patch() {
     popd || exit 1
 }
 
-commits="$(git log --pretty=oneline --reverse --since='1 months ago' heimdal | cut -d' ' -f1)"
+commits="$(git log --pretty=oneline --reverse $IMPORT_HASH..origin/master heimdal | cut -d' ' -f1)"
 for c in $commits; do
     git log $c -1
     echo -n "Try apply? [Y/n] "