Your message dated Fri, 03 Oct 2014 19:33:41 +0000
with message-id <[email protected]>
and subject line Bug#760033: fixed in debhelper 9.20141003
has caused the Debian Bug report #760033,
regarding debhelper: dh_clean removes Git refs information with certain 
suffixes like .orig, .rej, ...
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
760033: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760033
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: debhelper
Version: 9.20140817
Severity: critical
Justification: causes serious data loss


I had a branch named "mika/678696.orig" in one of my Git
repositories and when executing git-buildpackage in it I suddenly
lost Git information for that branch, the reason being dh_clean.

Demonstration with a minimal example:

,---- [ demo ]
| % git init
| Initialized empty Git repository in /tmp/tmp.rDCKYGKXqx/.git/
| % echo init > foo
| % git add foo
| % git commit -m 'init'
| [master (root-commit) 1179777] init
|  1 file changed, 1 insertion(+)
|  create mode 100644 foo
| % git checkout -b demo.orig
| Switched to a new branch 'demo.orig'
| % echo 2nd commit > foo
| % git commit -a -m '2nd commit'
| [demo.orig 65f5bb1] 2nd commit
|  1 file changed, 1 insertion(+), 1 deletion(-)
| % git log --oneline
| 65f5bb1 2nd commit
| 1179777 init
| % mkdir debian
| % touch debian/control
| % dh_clean
| dh_clean: No compatibility level specified in debian/compat
| dh_clean: This package will soon FTBFS; time to fix it!
| dh_clean: Compatibility levels before 5 are deprecated (level 1 in use)
| % git log
| fatal: bad default revision 'HEAD'
| % git status
| On branch demo.orig
|
| Initial commit
|
| Changes to be committed:
|   (use "git rm --cached <file>..." to unstage)
|
|         new file:   foo
|
| Untracked files:
|   (use "git add <file>..." to include in what will be committed)
|
|         debian/
`----

The problem is in dh_clean which is getting rid of certain files,
quoting dh_clean's source code:

,---- [ dh_clean ]
| # Remove other temp files.
| complex_doit("find . $find_options \\( \\( -type f -a \\
|         \\( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \\
|          -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \\
|          -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \\
|          -o -name TAGS -o \\( -path '*/.deps/*' -a -name '*.P' \\) \\
|         \\) -exec rm -f {} + \\) -o \\
|         \\( -type d -a -name autom4te.cache -prune -exec rm -rf {} + \\) 
\\)");
`----

The situation before executing dh_clean is:

,---- [ git files ]
| % find . -name \*.orig
| ./.git/refs/heads/demo.orig
| ./.git/logs/refs/heads/demo.orig
| %
`----

while *after* executing dh_clean all the demo.orig files in the git
repos are gone.

FTR: this of course doesn't affect just branch names ending with
".orig" but also all the other suffixes/file names listed in above's
dh_clean code snippet. Other VCS might be affected as well, but I
didn't check that.

Command lines for easy reproduction:

  cd $(mktemp -d)
  git init
  echo init > foo
  git add foo
  git commit -m 'init'
  git checkout -b demo.orig
  echo 2nd commit > foo
  git commit -a -m '2nd commit'
  git log --oneline
  mkdir debian
  touch debian/control
  dh_clean

Feel free to adjust severity as needed.

regards,
-mika-

--- End Message ---
--- Begin Message ---
Source: debhelper
Source-Version: 9.20141003

We believe that the bug you reported is fixed in the latest version of
debhelper, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Joey Hess <[email protected]> (supplier of updated debhelper package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Fri, 03 Oct 2014 15:16:00 -0400
Source: debhelper
Binary: debhelper
Architecture: source all
Version: 9.20141003
Distribution: unstable
Urgency: medium
Maintainer: Debhelper Maintainers <[email protected]>
Changed-By: Joey Hess <[email protected]>
Description:
 debhelper  - helper programs for debian/rules
Closes: 760033
Changes:
 debhelper (9.20141003) unstable; urgency=medium
 .
   * dh_clean: Skip over .git, .svn, .bzr, .hg, and CVS directories
     and avoid cleaning their contents. Closes: #760033
Checksums-Sha1:
 0fdd30be655a3c8d69ec592801239c0ec6bf528c 1678 debhelper_9.20141003.dsc
 4803ccbdabb7715650ee735cbcd82253045ec7f0 545431 debhelper_9.20141003.tar.gz
 dce656f4a1d9a0b19e651349e1dffa1c28dfeafb 811100 debhelper_9.20141003_all.deb
Checksums-Sha256:
 a766acca98daf631b06b91cc79f573a59be1190407435f638c850f25dafca799 1678 
debhelper_9.20141003.dsc
 cd7711176de2cef7943a239f7d27b706b0012e13e5f5309779447252fb0f6081 545431 
debhelper_9.20141003.tar.gz
 22eecfcea2cfd36ef845b93553f060c835143ba6a3ff5e720266b421365e4620 811100 
debhelper_9.20141003_all.deb
Files:
 b77c1a83bff67b710fcc898e572e214e 811100 devel optional 
debhelper_9.20141003_all.deb
 4fd8b637c0b26c1c7bc505a6b90b79d0 1678 devel optional debhelper_9.20141003.dsc
 1a1aa92875339d9a17a28a1bc08aff76 545431 devel optional 
debhelper_9.20141003.tar.gz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIVAwUBVC74MMkQ2SIlEuPHAQJ40g/+Jmh9OsJ1duETZscQDBjC0tdMxKmoUngm
MKcDTj3qYHItc5le92HrI/YSnEyKdCEgvWUf444oayLXXUcSCcApa9E0LP4/oWkg
oOiFvtbu9LEFZGmJ+L4BfWGn3PNxDvJ9qCmethY0uTrrEtMaROBfd+T4VjbO5n0y
i+fQCt9qBPRQwIuEMlggT4rld9nkhHHeHlUafuNeAj/c+FZJYiSSuu/EvaoLg1UT
BzVDA5GCY7+LIXGXZ+0F58QCln88fW+1Cz/mlwxXx7VfNqOnzSd1q3/TeYCfBj0u
o6Kuik6XYmqoNLKhcv6itEdA2RQ3L2HJATsVlZnorlRxVm0CysJf8J+0LRpBpLDc
SWUcVf+4HN6MBl27x96CDxKLsoOcGm3C8GvhbI8EGpGS+Kyf5Y/+wqd7pEP4dVvb
7mxO4ttSCYE3sQcd5dkywcQTiB7dm8upxkvwkybJmi3can/yhYmPONs4DvRvpWEO
KWJ8+NHOvQ2XgDX2RMGnnKFKK4XQgo1VJ5t9I3jLR9IWidAuT6OhlwMKXHL07X0o
syovnhEDmCUljHUtBUhTS8GoCtMm0fObNNn554oyeyXWYT1yLDteTkNT4A9CLLDS
fKCDB1xrEz7NmiOvikpQ8dFnJC20PPdv29SusAu0K5cRGe62HRCKTwMEbkODnFU5
PbUvko/H/GU=
=1Z/I
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to