ext/libgit2-0006-crlf-update-add-to-index-logic-to-reflect-Git-2.9-be.patch

   1 From 28ae62788be6a43144a9e8c80285c9ee97781e9e Mon Sep 17 00:00:00 2001
   2 From: Sven Strickroth <email@cs-ware.de>
   3 Date: Sun, 29 Jan 2017 02:12:07 +0100
   4 Subject: [PATCH 6/7] crlf: update add to index logic to reflect Git 2.9+
   5  behavior
   6
   7 The logic differs on *nix and Windows now.
   8
   9 Signed-off-by: Sven Strickroth <email@cs-ware.de>
  10 ---
  11  src/crlf.c | 19 +++++++++++--------
  12  1 file changed, 11 insertions(+), 8 deletions(-)
  13
  14 diff --git a/src/crlf.c b/src/crlf.c
  15 index 013f22e29..f0f1e26af 100644
  16 --- a/src/crlf.c
  17 +++ b/src/crlf.c
  18 @@ -165,9 +165,10 @@ static int crlf_apply_to_odb(
  19
  20         /* If safecrlf is enabled, sanity-check the result. */
  21         if (ca->crlf_action == GIT_CRLF_INPUT ||
  22 -               (ca->auto_crlf == GIT_AUTO_CRLF_INPUT &&
  23 -               (ca->crlf_action == GIT_CRLF_GUESS || ca->crlf_action == GIT_CRLF_AUTO ||
  24 -               (ca->crlf_action == GIT_CRLF_TEXT && ca->eol == GIT_EOL_UNSET)))) {
  25 +               (ca->crlf_action == GIT_CRLF_GUESS || ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_TEXT) && ca->eol == GIT_EOL_LF ||
  26 +               (ca->auto_crlf == GIT_AUTO_CRLF_INPUT && (ca->crlf_action == GIT_CRLF_GUESS)) ||
  27 +               (ca->auto_crlf == GIT_AUTO_CRLF_INPUT && (ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_TEXT) && ca->eol == GIT_EOL_UNSET) ||
  28 +               (GIT_EOL_NATIVE != GIT_EOL_CRLF && ca->auto_crlf == GIT_AUTO_CRLF_FALSE && (ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_TEXT) && ca->eol == GIT_EOL_UNSET)) {
  29                 if (stats.crlf) {
  30                         switch (ca->safe_crlf) {
  31                         case GIT_SAFE_CRLF_FAIL:
  32 @@ -182,9 +183,11 @@ static int crlf_apply_to_odb(
  33                                 break;
  34                         }
  35                 }
  36 -       } else if (ca->crlf_action == GIT_CRLF_CRLF ||
  37 -                               (ca->auto_crlf == GIT_AUTO_CRLF_TRUE && ca->crlf_action == GIT_CRLF_GUESS ||
  38 -                               ((ca->crlf_action == GIT_CRLF_TEXT || ca->crlf_action == GIT_CRLF_AUTO) && ca->eol == GIT_EOL_UNSET))) {
  39 +       } else if ((ca->crlf_action == GIT_CRLF_CRLF ||
  40 +               ((ca->crlf_action == GIT_CRLF_GUESS || ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_TEXT) && ca->eol == GIT_EOL_CRLF) ||
  41 +               (ca->auto_crlf == GIT_AUTO_CRLF_TRUE && (ca->crlf_action == GIT_CRLF_GUESS)) ||
  42 +               (ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_TEXT)) &&
  43 +               !(GIT_EOL_NATIVE != GIT_EOL_CRLF && ca->auto_crlf == GIT_AUTO_CRLF_FALSE && (ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_TEXT) && ca->eol == GIT_EOL_UNSET)) {
  44                 if (stats.lf != stats.crlf) {
  45                         switch (ca->safe_crlf) {
  46                         case GIT_SAFE_CRLF_FAIL:
  47 @@ -326,8 +329,6 @@ static int crlf_check(
  48          * Use the core Git logic to see if we should perform CRLF for this file
  49          * based on its attributes & the value of `core.autocrlf`
  50          */
  51 -       ca.crlf_action = crlf_input_action(&ca);
  52 -
  53         if (ca.crlf_action == GIT_CRLF_BINARY)
  54                 return GIT_PASSTHROUGH;
  55
  56 @@ -336,6 +337,8 @@ static int crlf_check(
  57                 ca.crlf_action == GIT_CRLF_TEXT) &&
  58                 git_filter_source_mode(src) == GIT_FILTER_SMUDGE)) {
  59
  60 +               ca.crlf_action = crlf_input_action(&ca);
  61 +
  62                 if (ca.crlf_action == GIT_CRLF_GUESS &&
  63                         ca.auto_crlf == GIT_AUTO_CRLF_FALSE)
  64                         return GIT_PASSTHROUGH;
  65 --
  66 2.16.1.windows.4
  67