diff --git a/makepending b/makepending index 40f111905831a14bc661750007f5e693bbae50ae..7a31d56aa55f2908e576804f780dae2d5aced9b6 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