diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-12-10 16:57:03 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-12-10 16:57:03 +0000 |
| commit | 0e8974c8c464447f2fb6b46132de5eb52157178a (patch) | |
| tree | 648d448f74bb18fc014db52ac946cc550110c667 | |
| parent | 21fe8cac5062b0e87c8bb46f6db00675b09a1b1f (diff) | |
| parent | 7570666e34f4f051f36926c8fb3b9a6d998e5d82 (diff) | |
Merge branch 'telepathy-glib-0.12'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | tools/telepathy.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/telepathy.am b/tools/telepathy.am index 45baa7727..971502639 100644 --- a/tools/telepathy.am +++ b/tools/telepathy.am @@ -30,6 +30,10 @@ _is-release-check: echo "Hey! Your tree is dirty! No release for you." >&2; \ exit 2; \ fi + @if ! git diff --cached --no-ext-diff --quiet --exit-code; then \ + echo "Hey! You have changes staged! No release for you." >&2; \ + exit 2; \ + fi %.tar.gz.asc: %.tar.gz $(AM_V_GEN)gpg --detach-sign --armor $@ |