pull doesn't work on adjusted branches

Please describe the problem.

Pull works fine if both the source and destination repositories are on unadjusted branches.

If either of the repositories is on an adjusted branch, the pull operation does not copy anything.

What steps will reproduce the problem?

git annex pull --allow-unrelated-histories pull-remote

What version of git-annex are you using? On what operating system?

10.20231228-g5540f42e21afce6947d5410c5f18b178de6c336a

on Linux

Please provide any additional information below.

# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log


# End of transcript or log.

Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)

Yes, I am developing the easy-git-annex interface.

RSS Atom

comment 1

Works for me. Also if pull didn't work, sync wouldn't work and surely someone would have reported such a problem?

But, you left out information including what kind of adjusted branch. Please provide the details needed to reproduce your problem.

Here it is working:

joey@darkstar:~/tmp/bench/y#master(unlocked)>git-annex pull --allow-unrelated-histories origin
pull origin
remote: Enumerating objects: 10, done.
remote: Counting objects: 100% (10/10), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 8 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (8/8), 794 bytes | 397.00 KiB/s, done.
From /home/joey/tmp/bench/x
   2722cc7..f380042  git-annex  -> origin/git-annex
   3960dff..ae25b27  master     -> origin/master
(Merging into master...)
Updating 3960dff..ae25b27
Fast-forward
 x | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 x
(Merging into adjusted branch...)
Updating 6c80746..7a752e3
Fast-forward
 x | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 x
ok
(merging origin/git-annex into git-annex...)
(recording state in git...)
get x (from origin...)
ok
pull origin
ok
(recording state in git...)
(recording state in git...)
joey@darkstar:~/tmp/bench/y#master(unlocked)>cat x
hello, world

Comment by joey — Mon Feb 5 17:26:48 2024

Remove comment

comment 2

If I commit a change, setting annex.adjustedbranchrefresh to true is not working as I expected. I want to pull to one specified remote only. I do not want to sync with any other repositories or special remotes that may happen to be available at the moment. This is possibly another manifestation of the issue I submitted about export not copying.

The git annex sync command is not happy with here as a remote name.

I see the same result if I change both git annex adjust from --unlock to --lock. If both adjust statements are commented out, pull-repo1 ends up with a broken link to the second file. The workflow should be the same for all cases.

Here's a script reproducing what I have:

mkdir pull-repo1
mkdir pull-repo2

cd pull-repo1
git init --initial-branch main
git annex init pull-repo1
git config annex.adjustedbranchrefresh true
git config receive.denyCurrentBranch updateInstead
git annex config --set annex.largefiles include=*.xtx
git annex group here manual
git annex wanted here standard
echo "test file one" >> test-file-one.xtx
git annex add .
git commit -m "add test file one"
git annex adjust --unlock

cd ../pull-repo2
git clone --origin pull-repo1 ../pull-repo1 .
git annex init pull-repo2
cd ../pull-repo1
git remote add pull-repo2 ../pull-repo2
git annex push pull-repo2

cd ../pull-repo2
git config annex.adjustedbranchrefresh true
git config receive.denyCurrentBranch updateInstead
git annex config --set annex.largefiles include=*.xtx
git annex group here manual
git annex wanted here standard
git annex adjust --unlock
echo "test file two" >> test-file-two.xtx
git annex add .
git commit -m "add test file two"

cd ../pull-repo1
git annex pull --allow-unrelated-histories --content pull-repo2
git annex list

And here's its output:

Initialized empty Git repository in /home/juanito/Documents/pull-repo1/.git/
init pull-repo1 ok
(recording state in git...)
annex.largefiles include=*.xtx ok
(recording state in git...)
group here ok
(recording state in git...)
wanted here ok
(recording state in git...)
add test-file-one.xtx 
ok                                
(recording state in git...)
[main (root-commit) 6eff4e8] add test file one
 1 file changed, 1 insertion(+)
 create mode 120000 test-file-one.xtx
adjust  
Switched to branch 'adjusted/main(unlocked)'
ok
Cloning into '.'...
done.
init pull-repo2 (merging pull-repo1/git-annex into git-annex...)
(recording state in git...)
ok
(recording state in git...)
copy test-file-one.xtx (to pull-repo2...) 
(recording state in git...)       
ok
(recording state in git...)
push pull-repo2 
Enumerating objects: 9, done.
Counting objects: 100% (9/9), done.
Delta compression using up to 12 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (5/5), 426 bytes | 426.00 KiB/s, done.
Total 5 (delta 2), reused 0 (delta 0), pack-reused 0
To ../pull-repo2
 * [new branch]      main -> synced/main
 * [new branch]      git-annex -> synced/git-annex
ok
annex.largefiles include=*.xtx (merging synced/git-annex into git-annex...)
(recording state in git...)
ok
group here ok
(recording state in git...)
wanted here ok
(recording state in git...)
adjust  ok
add test-file-two.xtx 
ok                                
(recording state in git...)
[adjusted/main(unlocked) 57a9dab] add test file two
 1 file changed, 1 insertion(+)
 create mode 100644 test-file-two.xtx
pull pull-repo2 
remote: Enumerating objects: 32, done.
remote: Counting objects: 100% (29/29), done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 23 (delta 8), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (23/23), 2.24 KiB | 1.12 MiB/s, done.
From ../pull-repo2
 * [new branch]      adjusted/main(unlocked) -> pull-repo2/adjusted/main(unlocked)
 * [new branch]      git-annex  -> pull-repo2/git-annex
ok
(merging pull-repo2/git-annex into git-annex...)
here
|pull-repo2
||web
|||bittorrent
||||
XX__ test-file-one.xtx

Please observe test-file-two.xtx is not listed and also not in the first repository.

How should I proceed?

Comment by jstritch — Tue Feb 6 18:27:33 2024

Remove comment

Add a comment