Bug#439992: devscripts: changes to debian/changelog only cannot be committed

2007-08-29 Thread martin f krafft 
tags 439992 patch
thanks

also sprach Junichi Uekawa [EMAIL PROTECTED] [2007.08.29.0208 +0200]:
 [09:04:14]dancer64:pbuilder debcommit -m 'release 0.172' debian/changelog
 git commit -m 'release 0.172' 'debian/changelog' 'debian/changelog'
 error: pathspec 'debian/changelog' did not match any file(s) known to git.
 Did you forget to 'git add'?
 debcommit: commit failed

This is a problem with git:

piper:/tmp/cdt.dfw30467 date  a; git add a; git commit -m.
Created initial commit fed4229: .
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 a
piper:/tmp/cdt.dfw30467 git commit
piper:/tmp/cdt.dfw30467 date  a
piper:/tmp/cdt.dfw30467 git commit -m. a a
error: pathspec 'a' did not match any file(s) known to git.
Did you forget to 'git add'?

I'll raise this issue with the git mailing list, but I am not sure
it will fly. Thus, I suggest to fix this in devscripts as well.
Here's the patch (thanks to vorlon, Sesse, KiBi, ifvoid for perl hand-holding).

PS: I suggest declaring my $debchangelog='debian/changelog' and
using that in the code. Just seems cleaner.

diff -Nru /tmp/BL0GXNrulF/devscripts-2.10.7/scripts/debcommit.pl 
/tmp/gnlxlCsQWz/devscripts-2.10.8/scripts/debcommit.pl
--- /tmp/BL0GXNrulF/devscripts-2.10.7/scripts/debcommit.pl  2007-08-04 
22:54:20.0 +0200
+++ /tmp/gnlxlCsQWz/devscripts-2.10.8/scripts/debcommit.pl  2007-08-29 
10:01:30.0 +0200
@@ -109,7 +109,9 @@
 }
 
 my @files_to_commit = @ARGV;
-push @files_to_commit, 'debian/changelog' if @files_to_commit;
+if (@files_to_commit  !grep('debian/changelog', @files_to_commit)) {
+  push @files_to_commit, 'debian/changelog';
+}
 
 my $prog=getprog();
 if (! -e debian/changelog) {

-- 
 .''`.   martin f. krafft [EMAIL PROTECTED]
: :'  :  proud Debian developer, author, administrator, and user
`. `'`   http://people.debian.org/~madduck - http://debiansystem.info
  `-  Debian - when you have better things to do than fixing systems


digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)

Bug#439992: devscripts: changes to debian/changelog only cannot be committed

2007-08-29 Thread Adam D. Barratt 

martin f krafft wrote, Wednesday, August 29, 2007 9:06 AM:


Here's the patch (thanks to vorlon, Sesse, KiBi, ifvoid for perl
hand-holding).


Commited; thanks.


PS: I suggest declaring my $debchangelog='debian/changelog'
and using that in the code. Just seems cleaner.


Already handled due to #437387 :-)

Adam


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#439992: devscripts: changes to debian/changelog only cannot be committed

2007-08-28 Thread Junichi Uekawa 
Package: devscripts
Version: 2.10.7
Severity: normal

'debian/changelog' is added unconditionally and it's not working.
The problem is that 

git commit -m 'release 0.172' 'debian/changelog' 'debian/changelog'

does not work, while

git commit -m 'release 0.172' 'debian/changelog'

works, and debcommit is unconditionally adding 'debian/changelog'


[09:04:14]dancer64:pbuilder debcommit -m 'release 0.172' debian/changelog
git commit -m 'release 0.172' 'debian/changelog' 'debian/changelog'
error: pathspec 'debian/changelog' did not match any file(s) known to git.
Did you forget to 'git add'?
debcommit: commit failed
[09:04:19]dancer64:pbuilder git-add debian/changelog 
[09:04:26]dancer64:pbuilder debcommit -m 'release 0.172' 
git commit -m 'release 0.172'
Created commit 8fdbbd6: release 0.172
 1 files changed, 2 insertions(+), 2 deletions(-)


-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.23-rc3dancer (PREEMPT)
Locale: LANG=ja_JP.EUC-JP, LC_CTYPE=ja_JP.EUC-JP (charmap=EUC-JP) (ignored: 
LC_ALL set to ja_JP.eucJP)
Shell: /bin/sh linked to /bin/bash

Versions of packages devscripts depends on:
ii  debianutils   2.23.1 Miscellaneous utilities specific t
ii  dpkg-dev  1.14.5 package building tools for Debian
ii  libc6 2.6.1-1GNU C Library: Shared libraries
ii  perl  5.8.8-7Larry Wall's Practical Extraction 
ii  sed   4.1.5-3The GNU sed stream editor

Versions of packages devscripts recommends:
ii  fakeroot  1.7.1  Gives a fake root environment

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]