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

patch applied

Browse source
This commit is contained in:
Joey Hess 2020-03-26 15:18:47 -04:00
parent 376e69ec65
commit c9ac7aa338
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG
View file

@ -8,9 +8,12 @@ git-annex (8.20200310) UNRELEASED; urgency=medium
multiple times to git. multiple times to git.
* add --force-small: Fix a bug that, when adding a symbolic link, * add --force-small: Fix a bug that, when adding a symbolic link,
checked in the content of the file the symlink pointed to. checked in the content of the file the symlink pointed to.
Thanks, Kyle Meyer for noticing and for the patch. Thanks, Kyle Meyer for the patch.
* add --force-small: Fix failure when passed a modified submodule. * add --force-small: Fix failure when passed a modified submodule.
Thanks, Kyle Meyer for noticing and for the patch. Thanks, Kyle Meyer for the patch.
* When syncing changes back from an adjusted branch to the basis branch,
include changes to submodules.
Thanks, Kyle Meyer for the patch.
-- Joey Hess <id@joeyh.name> Mon, 16 Mar 2020 12:43:33 -0400 -- Joey Hess <id@joeyh.name> Mon, 16 Mar 2020 12:43:33 -0400

1
doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit.mdwn
View file

@ -91,3 +91,4 @@ index da05a3fa5..9627ae969 100644
[[!meta author=kyle]] [[!meta author=kyle]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
> [[applied|done]], thanks! --[[Joey]]

13
doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit/comment_2_e37aaf6d440b6c2a7567b3df1c344ff7._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2020-03-26T18:53:05Z"
content="""
Ok, figured it out.. reverseAdjustedTree uses a `propchanges`
function that looks at the diff from adjusted branch to basis,
and substitutes the new sha for the old one. So that's
how the sha get changed.
My analysis was otherwise correct, I think. And your patch is fine, now
that I understand that. Applying it as-is.
"""]]