From 60dcfa78dd9724d4ed0c73ca0882b4c46c9f6634 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien42@gmail.com>
Date: Fri, 16 May 2025 21:59:07 +0200
Subject: [PATCH] Git EOL character conversion

 - convert EOL characters on checkout as set in git config
---
 .../libs/git/jgit/utils/CheckoutIndex.java        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ide/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java b/ide/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java
index 786e627f6e7b..18b619acb5d7 100644
--- a/ide/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java
+++ b/ide/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java
@@ -25,6 +25,7 @@
 import java.util.Collection;
 import org.eclipse.jgit.dircache.Checkout;
 import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.dircache.DirCacheCheckout.CheckoutMetadata;
 import org.eclipse.jgit.dircache.DirCacheEntry;
 import org.eclipse.jgit.dircache.DirCacheIterator;
 import org.eclipse.jgit.lib.FileMode;
@@ -87,25 +88,25 @@ public void checkout() throws IOException, GitException {
                 if (dit != null && (recursively || directChild(roots, repository.getWorkTree(), path)) && (fit == null || fit.isModified(dit.getDirCacheEntry(), checkContent, od))) {
                     // update entry
                     listener.notifyFile(path, treeWalk.getPathString());
-                    checkoutEntry(repository, path, dit.getDirCacheEntry(), od);
+                    checkoutEntry(repository, treeWalk, path, dit.getDirCacheEntry(), od);
                 }
             }
         }
     }
 
-    public void checkoutEntry (Repository repository, File file, DirCacheEntry e, ObjectReader od) throws IOException, GitException {
+    private void checkoutEntry(Repository repository, TreeWalk treeWalk, File file, DirCacheEntry entry, ObjectReader reader) throws IOException, GitException {
         // ... create/overwrite this file ...
         if (!ensureParentFolderExists(file.getParentFile())) {
             return;
         }
 
         boolean exists = file.exists();
-        if (exists && e.getFileMode() == FileMode.SYMLINK) {
+        if (exists && entry.getFileMode() == FileMode.SYMLINK) {
             monitor.notifyWarning(MessageFormat.format(Utils.getBundle(CheckoutIndex.class).getString("MSG_Warning_SymLink"), file.getAbsolutePath())); //NOI18N
             return;
         }
 
-        if (Utils.isFromNested(e.getFileMode().getBits())) {
+        if (Utils.isFromNested(entry.getFileMode().getBits())) {
             if (!exists) {
                 file.mkdirs();
             }
@@ -116,9 +117,13 @@ public void checkoutEntry (Repository repository, File file, DirCacheEntry e, Ob
             }
             file.createNewFile();
             if (file.isFile()) {
+                CheckoutMetadata checkoutMetadata = new CheckoutMetadata(
+                        treeWalk.getCheckoutEolStreamType(0),
+                        treeWalk.getSmudgeCommand(0)
+                );
                 new Checkout(repository)
                         .setRecursiveDeletion(false)
-                        .checkout(e, null, od, null);
+                        .checkout(entry, checkoutMetadata, reader, null);
             } else {
                 monitor.notifyError(MessageFormat.format(Utils.getBundle(CheckoutIndex.class).getString("MSG_Warning_CannotCreateFile"), file.getAbsolutePath())); //NOI18N
             }