Revert "multiple -m"
authorJoey Hess <joeyh@joeyh.name>
Tue, 2 Apr 2024 21:29:07 +0000 (17:29 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 2 Apr 2024 21:29:07 +0000 (17:29 -0400)
commita8dd85ea5a9f8515819db04b9f1d154488193e7d
tree2b3b9db1729edd82d58fc29b9660afc79fc12c8e
parent2b0df3a76d9d0b5557d41824c11614fd41741651
Revert "multiple -m"

This reverts commit cee12f6a2fd7f90eb2aa72cd638b6bcdf45e4f92.

This commit broke git-annex init run in a repo that was cloned from a
repo with an adjusted branch checked out.

The problem is that findAdjustingCommit was not able to identify the
commit that created the adjusted branch. It seems that there is an extra
"\n" at the end of the commit message that it does not expect.

Since backwards compatability needs to be maintained, cannot just make
findAdjustingCommit accept it with the "\n". Will have to instead
have one commitTree variant that uses the old method, and use it for
adjusted branch committing.
15 files changed:
Annex/AdjustedBranch.hs
Annex/AdjustedBranch/Merge.hs
Annex/Branch.hs
Annex/Import.hs
Annex/RemoteTrackingBranch.hs
Annex/View.hs
CHANGELOG
Command/FilterBranch.hs
Command/Import.hs
Command/Sync.hs
Git/Branch.hs
doc/git-annex-assist.mdwn
doc/git-annex-import.mdwn
doc/git-annex-sync.mdwn
doc/todo/multiple_-m.mdwn