summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcommit.d/30bzr-add8
-rwxr-xr-xcommit.d/40bzr-rm3
-rwxr-xr-xcommit.d/40git-rm3
-rw-r--r--debian/changelog6
4 files changed, 18 insertions, 2 deletions
diff --git a/commit.d/30bzr-add b/commit.d/30bzr-add
new file mode 100755
index 0000000..62e4bac
--- /dev/null
+++ b/commit.d/30bzr-add
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$VCS" = bzr ] && [ -d .bzr ]; then
+ if ! bzr add .; then
+ echo "etckeeper warning: bzr add failed" >&2
+ fi
+fi
diff --git a/commit.d/40bzr-rm b/commit.d/40bzr-rm
index a13bfd7..d908a40 100755
--- a/commit.d/40bzr-rm
+++ b/commit.d/40bzr-rm
@@ -1,7 +1,8 @@
#!/bin/sh
set -e
-TAB=" "
+IFS='
+'
if [ "$VCS" = bzr ] && [ -d .bzr ]; then
for file in $(bzr deleted); do
diff --git a/commit.d/40git-rm b/commit.d/40git-rm
index 3d5289a..d2c51c2 100755
--- a/commit.d/40git-rm
+++ b/commit.d/40git-rm
@@ -1,7 +1,8 @@
#!/bin/sh
set -e
-TAB=" "
+IFS='
+'
if [ "$VCS" = git ] && [ -d .git ]; then
for file in $(git ls-files --deleted); do
diff --git a/debian/changelog b/debian/changelog
index 6385635..471b14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
etckeeper (0.15) UNRELEASED; urgency=low
* Support for the new bzr pre-commit hook. This requires bzr version 1.4.
+ (Jelmer Vernooij)
Closes: #473069
+ * bzr: Set nickname for tree in init.d/40vcs-init (Daniel Hahler)
+ * Add script to add new files during "commit" for bzr (commit.d/30bzr-add).
+ (Daniel Hahler)
+ * Fix handling of files with spaces, by setting IFS to "newline" in
+ commit.d/40bzr-rm and commit.d/40git-rm (Daniel Hahler)
-- Jelmer Vernooij <jelmer@samba.org> Sat, 05 Apr 2008 20:59:44 +0200