Your message dated Fri, 13 Dec 2013 19:03:46 +0000
with message-id <[email protected]>
and subject line Bug#731606: fixed in git-annex 5.20131213
has caused the Debian Bug report #731606,
regarding git-annex: git annex lock ignores modifications and replaces from
latest annexed version
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.)
--
731606: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731606
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-annex
Version: 4.20131106
Severity: grave
Tags: upstream
Justification: causes non-serious data loss
Hi.
I hope I'm not overreacting.
Consider the following situation, where :
1. a file is annexed, with git annex add.
2. make the file modifiable : git annex unlock
3. modify the contents of the file.
3. git annex lock the file
The lock command doesn't complain that the file was modified, and silently
removes it to replace it by the link to the previous version.
File changes are lost :-(
It seems this is on purpose, reading the manpage :
Use this to undo an unlock command if you don't want to modify the files, or
have made modifications you want to dis‐
card.
IMHO, this is really undesirable, as one should be warned/prompted that a
commit is necessary, by default. Only with an explicit force option would lock
ever erase pending changes (there's git reset for reverting changes, and having
lock duplicate the behaviour is confusing for git users, IMHO). Lock should
just be the inverse of unlock, i.e. no longer allowing modifications, but not
*erasing* modifications, if it happens there were some.
Hope this makes sense.
Best regards,
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.11-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-annex depends on:
ii curl 7.33.0-1
ii git 1:1.8.4.3-1
ii libc6 2.17-97
ii libffi6 3.0.13-4
ii libgmp10 2:5.1.2+dfsg-3
ii libgnutls26 2.12.23-8
ii libgsasl7 1.8.0-2
ii libicu48 4.8.1.1-14
ii libidn11 1.28-1
ii libxml2 2.9.1+dfsg1-3
ii libyaml-0-2 0.1.4-2
ii openssh-client 1:6.4p1-1
ii rsync 3.1.0-2
ii wget 1.14-5
ii zlib1g 1:1.2.8.dfsg-1
Versions of packages git-annex recommends:
ii bind9-host 1:9.8.4.dfsg.P1-6+nmu3
ii git-remote-gcrypt 0.20130908-5
ii gnupg 1.4.15-1.1
ii lsof 4.86+dfsg-1
ii quvi 0.4.2-1
ii ssh-askpass 1:1.2.4.1-9
Versions of packages git-annex suggests:
pn bup <none>
ii graphviz 2.26.3-15+b1
ii libnss-mdns 0.10-3.2
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: git-annex
Source-Version: 5.20131213
We believe that the bug you reported is fixed in the latest version of
git-annex, 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 git-annex 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: SHA256
Format: 1.8
Date: Fri, 13 Dec 2013 14:20:32 -0400
Source: git-annex
Binary: git-annex
Architecture: source amd64
Version: 5.20131213
Distribution: unstable
Urgency: low
Maintainer: Joey Hess <[email protected]>
Changed-By: Joey Hess <[email protected]>
Description:
git-annex - manage files with git, without checking their contents into git
Closes: 731142 731606
Changes:
git-annex (5.20131213) unstable; urgency=low
.
* Avoid using git commit in direct mode, since in some situations
it will read the full contents of files in the tree.
* assistant: Batch jobs are now run with ionice and nocache, when
those commands are available.
* assistant: Run transferkeys as batch jobs.
* Automatically fix up bad bare repositories created by
versions 5.20131118 through 5.20131127.
* rsync special remote: Fix fallback mode for rsync remotes that
use hashDirMixed. Closes: #731142
* copy --from, get --from: When --force is used, ignore the
location log and always try to get the file from the remote.
* Deal with box.com changing the url of their webdav endpoint.
* Android: Fix SRV record lookups for XMPP to use android getprop
command to find DNS server, since there is no resolv.conf.
* import: Add --skip-duplicates option.
* lock: Require --force. Closes: #731606
* import: better handling of overwriting an existing file/directory/broken
link when importing
* Windows: assistant and webapp work! (very experimental)
* Windows: Support annex.diskreserve.
* Fix bad behavior in Firefox, which was caused by an earlier fix to
bad behavior in Chromium.
* repair: Improve repair of git-annex index file.
* repair: Remove damaged git-annex sync branches.
* status: Ignore new files that are gitignored.
* Fix direct mode's handling when modifications to non-annexed files
are pulled from a remote. A bug prevented the files from being updated
in the work tree, and this caused the modification to be reverted.
* OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by
default.
.
git-annex (5.20131130) unstable; urgency=low
.
* init: Fix a bug that caused git annex init, when run in a bare
repository, to set core.bare=false.
.
git-annex (5.20131127.1) unstable; urgency=low
.
* Rebuild that does not try to use quvi 0.9 from experimental.
.
git-annex (5.20131127) unstable; urgency=low
.
* webapp: Detect when upgrades are available, and upgrade if the user
desires.
(Only when git-annex is installed using the prebuilt binaries
from git-annex upstream, not from eg Debian.)
* assistant: Detect when the git-annex binary is modified or replaced,
and either prompt the user to restart the program, or automatically
restart it.
* annex.autoupgrade configures both the above upgrade behaviors.
* Added support for quvi 0.9. Slightly suboptimal due to limitations in its
interface compared with the old version.
* Bug fix: annex.version did not get set on automatic upgrade to v5 direct
mode repo, so the upgrade was performed repeatedly, slowing commands down.
* webapp: Fix bug that broke switching between local repositories
that use the new guarded direct mode.
* Android: Fix stripping of the git-annex binary.
* Android: Make terminal app show git-annex version number.
* Android: Re-enable XMPP support.
* reinject: Allow to be used in direct mode.
* Futher improvements to git repo repair. Has now been tested in tens
of thousands of intentionally damaged repos, and successfully
repaired them all.
* Allow use of --unused in bare repository.
.
git-annex (5.20131120) unstable; urgency=low
.
* Fix Debian package to not try to run test suite, since haskell-tasty
is not out of new or in Build-Depends yet.
* dropunused, addunused: Allow "all" instead of a range to
act on all unused data.
* Ensure execute bit is set on directories when core.sharedrepository is set.
* Ensure that core.sharedrepository is honored when creating the .git/annex
directory.
* Improve repair code in the case where the index file is corrupt,
and this hides other problems from git fsck.
.
git-annex (5.20131118) unstable; urgency=low
.
* Direct mode repositories now have core.bare=true set, to prevent
accidentally running git commands that try to operate on the work tree,
and so do the wrong thing in direct mode.
* annex.version is now set to 5 for direct mode repositories.
This upgrade is handled fully automatically, no need to run
git annex upgrade
* The "status" command has been renamed to "info", to allow
"git annex status" to be used in direct mode repositories, now that
"git status" won't work in them.
* The -c option now not only modifies the git configuration seen by
git-annex, but it is passed along to every git command git-annex runs.
* watcher: Avoid loop when adding a file owned by someone else fails
in indirect mode because its permissions cannot be modified.
* webapp: Avoid encoding problems when displaying the daemon log file.
* webapp: Improve UI around remote that have no annex.uuid set,
either because setup of them is incomplete, or because the remote
git repository is not a git-annex repository.
* Include ssh-keygen in standalone bundle.
* Allow optionally configuring git-annex with -fEKG to enable awesome
remote monitoring interfaceat http://localhost:4242/
* Fix bug that caused bad information to be written to the git-annex branch
when running describe or other commands with a remote that has no uuid.
* Work around Android linker problem that had prevented git-annex from
running on Android 4.3 and 4.4.
* repair: Handle case where index file is corrupt, but all objects are ok.
* assistant: Notice on startup when the index file is corrupt, and
auto-repair.
* Fix direct mode merge bug when a direct mode file was deleted and replaced
with a directory. An ordering problem caused the directory to not get
created in this case.
Thanks to Tim for the test case.
* Direct mode .git/annex/objects directories are no longer left writable,
because that allowed writing to symlinks of files that are not present,
which followed the link and put bad content in an object location.
Thanks to Tim for the test case.
* fsck: Fix up .git/annex/object directory permissions.
* Switched to the tasty test framework.
* Android: Adjust default .gitignore to ignore .thumbnails at any location
in the tree, not just at its top.
* webapp: Check annex.version.
Checksums-Sha1:
3d15f7e46fda9fc9e208512d8f5e28fe2fa23734 3329 git-annex_5.20131213.dsc
8f9a6898ee0e8c878064e2d0f130982a7d76c365 5242194 git-annex_5.20131213.tar.gz
c69c42d3ddb6f6587a53dd458e22a4b41d0af2f2 7370346 git-annex_5.20131213_amd64.deb
Checksums-Sha256:
53dee9dee338761fecf95504bd30ed3e20d47468b472f2672a1dc55e6ce6a1e4 3329
git-annex_5.20131213.dsc
6ebda3640b962a794b1d06a5c485e8b24ca718b2cd83fa4c99b38332f7353e8b 5242194
git-annex_5.20131213.tar.gz
7a3af1d4029602f86a26820b0a98557f15a77088f106304801ad67883aefe50e 7370346
git-annex_5.20131213_amd64.deb
Files:
46aa1c1024fe57885232b43ac9130def 3329 utils optional git-annex_5.20131213.dsc
c9c50719c7bbc7b8184ebc8203383d83 5242194 utils optional
git-annex_5.20131213.tar.gz
7d096d482591586af9df61c155f8f218 7370346 utils optional
git-annex_5.20131213_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
iQIVAwUBUqtV88kQ2SIlEuPHAQg+Nw/+IoDfnMw4eoXj+Vx8H4P48r7M/ux6lIVh
cbtrtEG4/1dL1ab9yGzB+ZUx5cWvEJ3+Zk9/orACRfeB2g0aVk2i5yRendq3A3e3
Fby9wlDNGmd0OwigE/KLCqvKLpUa87P3gbZrQyKlCy3MqCV4sMzQmw7XrMF041wP
zM+Ftrm7YgFnZoYXN1UgB7GMXQKyzSzawrRWoRVlSYVWhA200C/g+hq4MRPp8Oqr
PQOP01WRdeftivSaTASTGqCvdQD2OlAI6opR4J2/oZ8Fv+ANQ9SyR/Fcjufqqv/I
vjsiflW036L0dCKpBoxgTm/gNC1HohqKZMW9F6jp5NWkwUwGNOuzNLU4qMR9MdIs
uhuEAxIqLNjTLzhrudMbhYvyGLvN5BsjuTEZbwGZy+Jz6QeIaSVUyY5XHOeNJ8Nj
NGmDYwASdYLfokwJAO5XTjhTZAmVYYacBI1gr0ZoPneX6p1pwtrsPGm8BnJeWTRV
OOeusW1pNQLJanXR0Qx5S6yhrU/Ox8rjZcmssB7T/VKJQpZq40HPkwpxTx+40aDb
dJqVCqcq3FwHkoaIeZ7/oF5Oe6N1UuwDqftdMj/T3SoDEfYT00RAhRIaSB4Xlj+n
i9276aFT/YCIWXCi/zGXfsTRAu4/aI5uoODrCLwnicegJdXkIrtxqOB96ZwS15Bz
7ZSvLCLtPhE=
=n77y
-----END PGP SIGNATURE-----
--- End Message ---
