Bug#467346: devscripts: [debcommit] Please run git add debian/changelog when git is used

2008-03-18 Thread Bernd Zeimetz

 debcommit: unable to determine commit message using git (do you mean 
 debcommit -a or did you forget to run git add?)
 Try using the -m flag.

Actually I didn't know about -a, I think that's just all I need to
remember. What I did was something like

dch
git add d/changelog
dch
debcommit

then you have something added already, so you can commit, but it's not
the last edit you did. I had expected to be warned about this, or
something like that... but I guess I should just get used to -a :)

Cheers,

Bernd

-- 
Bernd Zeimetz
[EMAIL PROTECTED] http://bzed.de/


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



Bug#467346: devscripts: [debcommit] Please run git add debian/changelog when git is used

2008-03-13 Thread Adam D. Barratt
On Sun, 2008-02-24 at 19:59 +, Adam D. Barratt wrote:
 On Sun, 2008-02-24 at 20:28 +0100, Bernd Zeimetz wrote:
  Package: devscripts
  Version: 2.10.13
  Severity: wishlist
  
  Please either run git add debian/changelog before commiting, or only use
  the diff between the last HEAD and the latest 'added' version of
  debian/changelog. Otherwise you can end up with a commit without the
  appropriate changelog entry.
 
 Apologies if I've misunderstood, as I must admit to not being a git
 user, but I believe this is exactly the situation for which we added the
 -a switch to debcommit.

I've just had a look at the relevant section of debcommit while making
another change. If a message was not passed using the --message
parameter, debcommit will run git diff in order to look for uncommitted
changes (with --cached unless -a was passed). If no uncommitted changes
are found, debcommit should be failing with the message:

debcommit: unable to determine commit message using git (do you mean 
debcommit -a or did you forget to run git add?)
Try using the -m flag.

Regards,

Adam



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



Bug#467346: devscripts: [debcommit] Please run git add debian/changelog when git is used

2008-02-24 Thread Bernd Zeimetz
Package: devscripts
Version: 2.10.13
Severity: wishlist

Please either run git add debian/changelog before commiting, or only use
the diff between the last HEAD and the latest 'added' version of
debian/changelog. Otherwise you can end up with a commit without the
appropriate changelog entry.


-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.24.1 (SMP w/1 CPU core; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages devscripts depends on:
ii  debianutils   2.28.2 Miscellaneous utilities specific t
ii  dpkg-dev  1.14.16.6  package building tools for Debian
ii  libc6 2.7-6  GNU C Library: Shared libraries
ii  perl  5.8.8-12   Larry Wall's Practical Extraction 
ii  sed   4.1.5-5The GNU sed stream editor

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

-- no debconf information



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



Bug#467346: devscripts: [debcommit] Please run git add debian/changelog when git is used

2008-02-24 Thread Adam D. Barratt
On Sun, 2008-02-24 at 20:28 +0100, Bernd Zeimetz wrote:
 Package: devscripts
 Version: 2.10.13
 Severity: wishlist
 
 Please either run git add debian/changelog before commiting, or only use
 the diff between the last HEAD and the latest 'added' version of
 debian/changelog. Otherwise you can end up with a commit without the
 appropriate changelog entry.

Apologies if I've misunderstood, as I must admit to not being a git
user, but I believe this is exactly the situation for which we added the
-a switch to debcommit.

From 2.10.6's changelog:

* debcommit: When using git, allow either all files or only those in
the index to be committed. Thanks to Martin F Kraft and Junichi
Uekawa for the patch. (Closes: #402539, #427429, #433081)

Without -a, debcommit uses git-diff --cached and git commit $files;
with -a, it uses git-diff and git commit -a.

Please see the discussion in #427429 for further details.

Regards,

Adam



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