summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-09-11 17:09:51 -0400
committerJoey Hess <joey@kitenet.net>2010-09-11 17:09:51 -0400
commit08a94e65720e2e89219201b152677b0fcda27479 (patch)
tree079cdb4fece063cad9231f33270ba751813d1c83
parent7873b20f45567e35fd5c0b8a5adc8a38ce45a1ae (diff)
Ignore -m switch to etckeeper commit, in case someone tries to use it with that option common to several VCS. Closes: #592050
-rwxr-xr-xcommit.d/50vcs-commit3
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 0 deletions
diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
index 197655f..959babb 100755
--- a/commit.d/50vcs-commit
+++ b/commit.d/50vcs-commit
@@ -12,6 +12,9 @@ if [ -n "$1" ]; then
if [ "x$1" = "x--stdin" ]; then
cat > "$logfile"
else
+ if [ "x$1" = "x-m" ]; then
+ shift 1
+ fi
echo "$1" > "$logfile"
fi
else
diff --git a/debian/changelog b/debian/changelog
index 3ddc0b6..d2589ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ etckeeper (0.49) UNRELEASED; urgency=low
* Ensure that PATH contains the directory containing etckeeper, so
that hook scripts that re-exec etckeeper are guaranteed to find it.
+ * Ignore -m switch to etckeeper commit, in case someone tries to use
+ it with that option common to several VCS. Closes: #592050
-- Joey Hess <joeyh@debian.org> Sun, 25 Jul 2010 19:44:37 -0400