Package: gitpkg
Version: 0.14
Severity: serious
Tags: patch
"git status" used to be synonymous to "git commit --dry-run", and is used that
way
in git-importdeb. The script now fails because "-a" is not understood by "git
status"
any more because of this.
commit 6a7b93ccfe1127de3e8398eeaa0b5e9e9a88c352
Author: Yann Dirson <ydir...@altern.org>
Date: Fri Jun 25 23:18:59 2010 +0200
Use "git commit --dry-run" not "git status", now that they are different.
This probably breaks with old git versions ?
diff --git a/git-debimport b/git-debimport
index 3ffc955..8781dda 100755
--- a/git-debimport
+++ b/git-debimport
@@ -213,7 +213,7 @@ if [ -n "$PACKAGE_TARS" ]; then
EMAIL=\<$(dpkg-parsechangelog | sed -n 's/Maintainer: //p' | cut -d\<
-f2)
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_NAME="$AUTHOR" GIT_COMMITTER_NAME="$AUTHOR" \
GIT_AUTHOR_EMAIL="$EMAIL" GIT_COMMITTER_EMAIL="$EMAIL" \
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
@@ -288,7 +288,7 @@ for f in $PACKAGE_DIFFS; do
DATE=$(file -L
$PKG_ROOT$PACKAGES_DIR/${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz | sed -n
"s/.*, last modified: \([^,]*\),*.*/\1/p")
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
git commit -a -m "git-debimport
${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz"
else
@@ -320,7 +320,7 @@ for f in $PACKAGE_DIFFS; do
DATE=$(file -L
$PKG_ROOT$PACKAGES_DIR/${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz | sed -n
"s/.*, last modified: \([^,]*\),*.*/\1/p")
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
git commit -a -m "git-debimport
${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz"
else
@@ -352,7 +352,7 @@ for f in $PACKAGE_DIFFS; do
EMAIL=\<$(dpkg-parsechangelog | sed -n 's/Maintainer: //p' | cut -d\< -f2)
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_NAME="$AUTHOR" GIT_COMMITTER_NAME="$AUTHOR" \
GIT_AUTHOR_EMAIL="$EMAIL" GIT_COMMITTER_EMAIL="$EMAIL" \
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (101,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32.13-evms (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages gitpkg depends on:
ii dpkg-dev 1.15.7.2 Debian package development tools
ii git [git-core] 1:1.7.1-1 fast, scalable, distributed revisi
ii git-core 1:1.7.1-1 fast, scalable, distributed revisi
gitpkg recommends no packages.
Versions of packages gitpkg suggests:
ii devscripts 2.10.64 scripts to make the life of a Debi
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
