From d5d4173213e477ec1f4a82ed8f60686f9d29ac9e Mon Sep 17 00:00:00 2001
From: Sascha Silbe <silbe@buildslave-debian-squeeze-32bit.sugarlabs.org>
Date: Wed, 14 Jul 2010 15:19:49 +0000
Subject: Don't use reset so we can show the differences between nightly builds in the changelog

---
diff --git a/build-snapshots b/build-snapshots
index 2f678db..1899224 100755
--- a/build-snapshots
+++ b/build-snapshots
@@ -8,22 +8,20 @@ repo_update() {
     git fetch origin
     git fetch upstream
     git checkout upstream
-    git reset --hard origin/upstream
     git merge upstream/master
     git checkout master
-    git reset --hard origin/master
     git merge upstream
 }
 
 append_git_changelog() {
     local range="${1}"
-    git log --pretty=format:'[%h] %s (%an)' "${range}" |xargs -L 1 --no-run-if-empty dch
+    git log --no-merges --pretty=format:'[%h] %s (%an)' "${range}" |xargs -L 1 --no-run-if-empty dch
 }
 
 version_set() {
     local upstream_version="$(git tag|grep ^v|tr -d v|sort -t . -n|tail -n 1)"
     dch --newversion "${upstream_version}-git$(date +%Y%m%d)-1" --preserve --distribution testing "Nightly snapshot package"
-    append_git_changelog origin/master..upstream/master
+    append_git_changelog master^..master
     git commit -m "Add changelog entry for nightly snapshot build" debian/changelog
 }
 
--
cgit v0.9.1