From 376d54296d5cd7c9b4e02456d017ed489982a85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Sun, 14 Oct 2012 23:30:02 +0200
Subject: [PATCH] Replaced last change with directory hoping
---
makepending | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/makepending b/makepending
index 40f11190..7a31d56a 100644
--- a/makepending
+++ b/makepending
@@ -120,8 +120,10 @@ then
continue
fi
- $TEST git --git-dir=$WD/.git checkout $DISTRO
- $TEST git --git-dir=$WD/.git merge master
+ cd $WD
+ $TEST git checkout $DISTRO
+ $TEST git merge master
+ cd $TMP
echo Upgrading $current at $DISTRO with ${UPSTREAM}_$upstream 1>&2
echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log
echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log 1>&2
--
GitLab