summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-06-28 12:54:24 -0400
committerScott Moser <smoser@brickies.net>2017-06-28 12:54:24 -0400
commit7d886cc182521bd9827db6d941d79f848a9b56e7 (patch)
tree5d8acace14c1f26bf3767d872059de5eb6431ef6
parent521de3cebcd54dcdb51676ba34ed7aab25251fdb (diff)
downloadvyos-cloud-init-7d886cc182521bd9827db6d941d79f848a9b56e7.tar.gz
vyos-cloud-init-7d886cc182521bd9827db6d941d79f848a9b56e7.zip
debian/cherry-pick: separate out changes to changelog
-rwxr-xr-xdebian/cherry-pick5
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/cherry-pick b/debian/cherry-pick
index 4906917f..dd557246 100755
--- a/debian/cherry-pick
+++ b/debian/cherry-pick
@@ -170,7 +170,7 @@ main() {
}
local commit_files=""
- commit_files=( debian/changelog "$series" "$fpath" )
+ commit_files=( "$series" "$fpath" )
git diff HEAD "${commit_files[@]}"
echo -n "Commit this change? (Y/n): "
@@ -187,6 +187,9 @@ main() {
git commit -m "$msg" "${commit_files[@]}" ||
fail "failed to commit '$msg'"
+ git commit -m "update changelog" debian/changelog ||
+ fail "failed to commit update to debian changelog."
+
return 0
}