diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-06 16:30:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-06 16:49:41 -0400 |
| commit | d1ce927d95fe7c331cbff3317797a60aa288738b (patch) | |
| tree | 829907a023dffa26da9eb60481e2269af406b1ac /debian | |
| parent | 6a639f6f0880d96743310728719fc797a60b2ad8 (diff) | |
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such.
So, we need to look at both the file on disk to see if it's a annex link,
and the file in the index too. lookupFile doesn't look in the index if the file
is not present on disk.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index cab3bc8d4..e5d968d9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,9 @@ git-annex (6.20151219) UNRELEASED; urgency=medium This may break existing parsers of this json output, if there were any. * whereis --json: Make url list be included in machine-parseable form. * test: Added --keep-failures option. + * unused: Bug fix when a new file was added to the annex, and then + removed (but not git rmed). git still has the add staged in this case, + so the content should not be unused and was wrongly treated as such. -- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 13:31:17 -0400 |