Bug#712166: debcommit: exits on clean working directories on git status due to changed output message in git

[Salvatore Bonaccorso]

Package: devscripts
Version: 2.13.2
Severity: normal
Tags: patch

Hi

Recent git version uploaded to unstable changed the output format of
git status when the working directory is clean:

Older versions have:

nothing to commit (working directory clean)

whereas git 1:1.8.3.1-1 as uploaded in unstable has

nothing to commit, working directory clean

518     elsif ($prog eq 'git') {
519     if (! @files_to_commit && ($all || $release)) {
520         # check to see if the WC is clean. git-commit would exit
521         # nonzero, so don't run it in --all or --release mode.
522         my $status=`LANG=C git status`;
523         if ($status=~/nothing to commit \(working directory clean\)/) {                                                                                                         
524             print $status;
525             return;
526         }
527     }

so with newer git versions the status on line 523 do not match the
expression and git will exit later on.

Something like

$status =~ /nothing to commit/ && $status =~ /working directory clean/

would do the trick.

Regards,
Salvatore
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Adapt-to-changed-output-for-git-status-in-newer-git-.patch
Type: text/x-diff
Size: 1162 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/devscripts-devel/attachments/20130613/88454d3c/attachment.patch>