]> source.dussan.org Git - jgit.git/commit
ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider 78/1203278/4
authorNasser Grainawi <quic_nasserg@quicinc.com>
Tue, 29 Oct 2024 23:22:15 +0000 (17:22 -0600)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 4 Nov 2024 23:16:39 +0000 (00:16 +0100)
commit3a7a9cb0e89de263d0a5133949c9c9bed5141916
tree26a2adb3e4590d8dd08e2f54b9e972556e82f428
parent4f48a5b1e3842aeeae6b8f0f5d517819373221a4
ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider

When a merger is created without a Repository, no
AttributesNodeProvider is created in the TreeWalk. Since mergers are
often created with a custom ObjectInserter and no repo, they skip any
lookups of attributes from any of the gitattributes files (within a
tree, in the repo info/ dir, or user/global). Since there are
potentially merge-affecting attributes in those files, callers might
want to use both a custom ObjectInserter and an AttributesNodeProvider.

Change-Id: I7997309003bbb598e1002261b3be7f2cc52066c8
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java