mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

sync, merge: Added --allow-unrelated-histories option

Browse source 
Which is the same as the git merge option.

After last commit, this turns out to be needed in the test suite, and when
doing git-annex import from special remote, followed by a git-annex merge.

Sponsored-by: Svenne Krap on Patreon
This commit is contained in:
Joey Hess 2021-07-19 12:08:24 -04:00
parent b6bea0d3f2
commit 3d50b47ded
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 67 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Test.hs
View file

@ -1983,7 +1983,7 @@ test_export_import_subdir = intmpclonerepo $ do
testimport = do
origbranch <- annexeval origBranch
git_annex "import" [origbranch++":"++subdir, "--from", "foo"] "import of subdir"
git_annex "merge" ["foo/master"] "git annex merge foo/master"
git_annex "merge" ["foo/master", "--allow-unrelated-histories"] "git annex merge foo/master"
-- Make sure that import did not import the file to the top
-- of the repo.