neilcsmith-net commented on code in PR #6672:
URL: https://github.com/apache/netbeans/pull/6672#discussion_r1387732441
##########
ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java:
##########
@@ -430,15 +430,24 @@ protected boolean mergeTreeWalk (TreeWalk treeWalk,
boolean ignoreConflicts)
boolean hasWorkingTreeIterator = tw.getTreeCount() >
T_FILE;
boolean hasAttributeNodeProvider =
treeWalk.getAttributesNodeProvider() != null;
while (treeWalk.next()) {
+ Attributes[] attributes = hasAttributeNodeProvider ?
+ new Attributes[] {
+ treeWalk.getAttributes(T_BASE),
+ treeWalk.getAttributes(T_OURS),
+ treeWalk.getAttributes(T_THEIRS)
+ } : new Attributes[] {
+ NO_ATTRIBUTES,
+ NO_ATTRIBUTES,
+ NO_ATTRIBUTES
+ };
Review Comment:
That formatting choice was deliberate! ;-) I wanted each element on a
separate line for clarity of what's going on here given the horrible API!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
