* Add tests for /etc/.git not yet existing and avoid doing bad things.

  Closes: #451185
* If /etc/.git doesn't exist, display a suggestion to run etckeeper-init.

3 files changed, 19 insertions, 12 deletions

diff --git a/post-apt.d/30git-add b/post-apt.d/30git-add
index 06504b4..79aa406 100755
--- a/post-apt.d/30git-add
+++ b/post-apt.d/30git-add
@@ -1,5 +1,7 @@
 #!/bin/sh
 set -e
-if ! git-add .; then
-	echo "etckeeper warning: git-add failed" >&2
+if [ -d .git ]; then
+	if ! git-add .; then
+		echo "etckeeper warning: git-add failed" >&2
+	fi
 fi
diff --git a/post-apt.d/40git-rm b/post-apt.d/40git-rm
index 4a47435..01161ca 100755
--- a/post-apt.d/40git-rm
+++ b/post-apt.d/40git-rm
@@ -3,8 +3,10 @@ set -e
 
 TAB="	"
 
-for file in $(git ls-files --deleted); do
-	if [ ! -d "$file" ]; then 
-		git rm "$file"
-	fi
-done
+if [ -d .git ]; then
+	for file in $(git ls-files --deleted); do
+		if [ ! -d "$file" ]; then 
+			git rm "$file"
+		fi
+	done
+fi
diff --git a/post-apt.d/50git-commit b/post-apt.d/50git-commit
index 30ef0f2..6eb3434 100755
--- a/post-apt.d/50git-commit
+++ b/post-apt.d/50git-commit
@@ -1,9 +1,12 @@
 #!/bin/sh
 set -e
 
-# TODO: figure out what packages were acted on by the apt run, and include
-# that info in the commit message
-message="committing changes after apt run"
+if [ -d .git ]; then
 
-# ignore exit code since it exits nonzero if there is nothing to do
-git commit -m "$message" || true
+	# TODO: figure out what packages were acted on by the apt run, and
+	# include that info in the commit message
+	message="committing changes after apt run"
+
+	# ignore exit code since it exits nonzero if there is nothing to do
+	git commit -m "$message" || true
+fi