diff options
author | Sascha Silbe <silbe@buildslave-debian-squeeze-32bit.sugarlabs.org> | 2010-07-14 16:16:01 (GMT) |
---|---|---|
committer | Sascha Silbe <silbe@buildslave-debian-squeeze-32bit.sugarlabs.org> | 2010-07-14 16:17:28 (GMT) |
commit | 2ac05fdf0b8b95f1c6724f47572a12a446b95476 (patch) | |
tree | 3b7774882039b553b2fad42d66a395e6f0002a8b | |
parent | 6acf5b9d91010985cf5adc30ff611a34a3a36469 (diff) |
fix incorrect changelog if autoregen is run
-rwxr-xr-x | build-snapshots | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build-snapshots b/build-snapshots index 5ecd327..756dd50 100755 --- a/build-snapshots +++ b/build-snapshots @@ -10,6 +10,7 @@ repo_update() { git checkout upstream git merge upstream/master git checkout master + git tag -f pre-merge master git merge upstream } @@ -21,7 +22,7 @@ append_git_changelog() { 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 master^..master + append_git_changelog pre-merge..master git commit -m "Add changelog entry for nightly snapshot build" debian/changelog } |