From 3ae36d1c7fc9787e335c29075cbae5326575b2c3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 4 Jan 2008 17:17:39 +0100
Subject: Merge branch 'pacman-g2'

Conflicts:

	Makefile
	pre-install.d/50uncommitted-changes

Additinoal fix:

As noted by Joey, we should bail out with an error if git commit fails when
using pacman-g2.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
 init.d/50git-ignore | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'init.d')

diff --git a/init.d/50git-ignore b/init.d/50git-ignore
index de58ed5..778774e 100755
--- a/init.d/50git-ignore
+++ b/init.d/50git-ignore
@@ -5,6 +5,14 @@ if [ ! -e .gitignore ]; then
 		cat >.gitignore <<EOF
 # new and old versions of conffiles, stored by dpkg
 *.dpkg-*
+EOF
+	fi
+	if [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" ]; then
+		cat >.gitignore <<EOF
+# new and old versions of conffiles, stored by pacman
+*.pacnew
+*.pacorig
+*.pacsave
 EOF
 	fi
 	cat >>.gitignore <<EOF
-- 
cgit v1.2.3