diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-03-11 14:38:03 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-03-11 14:38:03 -0700 |
| commit | c481b479107b41cb5ef2221aaaeb34a18f18c002 (patch) | |
| tree | fabed96b803e2a46daa4cb07a2ceaf38fea01cce | |
| parent | fb616f317b81b86e881ec036c8472dc1bf3cae5a (diff) | |
| parent | da45800bee048182963e444a62413c5f4db2b773 (diff) | |
| download | p5-Git-Annex-c481b479107b41cb5ef2221aaaeb34a18f18c002.tar.gz | |
Merge tag 'v0.003' into debian
v0.003
# gpg: Signature made Wed 11 Mar 2020 02:37:03 PM MST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: issuer "spwhitton@spwhitton.name"
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Changes | 10 | ||||
| -rw-r--r-- | dist.ini | 2 | ||||
| -rw-r--r-- | lib/App/annex_to_annex.pm | 9 |
4 files changed, 17 insertions, 5 deletions
@@ -1 +1,2 @@ /Git-Annex-* +/.build @@ -2,6 +2,16 @@ Revision history for Git::Annex {{$NEXT}} +0.003 2020-03-11 14:35:04-07:00 America/Phoenix + - annex-to-annex: Fix path passed to git-annex-find(1) when + looking for missing files. + - annex-to-annex: Fix path passed to git-annex-lookupkey(1) when + determining whether source files are annexed. + - annex-to-annex: Pass relative path to git-annex-find(1) when + determining if a file was unlocked in the source annex. + Workaround for bug in git-annex: git-annex-find(1) returns + incorrect response for absolute paths when in --batch mode. + 0.002 2020-02-24 07:33:02-07:00 America/Phoenix - Fix logic in an example in Git::Annex::BatchCommand SYNOPSIS. - annex-review-unused: 'b' should go back one entry not two. @@ -4,7 +4,7 @@ license = GPL_3 copyright_holder = Sean Whitton <spwhitton@spwhitton.name> copyright_year = 2019-2020 -version = 0.002 +version = 0.003 [PkgVersion] [PodWeaver] diff --git a/lib/App/annex_to_annex.pm b/lib/App/annex_to_annex.pm index d68cc4a..af4346b 100644 --- a/lib/App/annex_to_annex.pm +++ b/lib/App/annex_to_annex.pm @@ -109,9 +109,9 @@ sub main { #>>> } - my $base = basename $source; my @missing - = $annex->annex->find("--not", "--in", "here", $base); + = $annex->annex->find("--not", "--in", "here", + abs2rel $source, $annex->toplevel); if (@missing) { say "Following annexed files are not present in this repo:"; say for @missing; @@ -130,7 +130,7 @@ sub main { die "$target already exists!\n" if -e $target and !-d $target; - my $key = $lk->ask($rel); + my $key = $lk->ask($File::Find::name); if ($key) { # this is an annexed file my $content = rel2abs $cl->ask($key), $annex->toplevel; my $content_device_id = (stat $content)[0]; @@ -147,7 +147,8 @@ sub main { # to the source, or anything like that system "git", "-C", $dest, "annex", "add", $rel; system "git", "-C", $dest, "annex", "unlock", $rel - if $find->ask($rel); + if $find->ask(abs2rel $File::Find::name, + $annex->toplevel); # if using the default backend, quick sanity check if ($key =~ /^SHA256E-s[0-9]+--([0-9a-f]+)/) { |