From 2573638d3dbeb5b060f57ce187e534c49fac83b8 Mon Sep 17 00:00:00 2001
From: Kevin Willford <kewillf@microsoft.com>
Date: Wed, 5 Apr 2017 10:58:09 -0600
Subject: [PATCH] reset --stdin: trim carriage return from the paths

While using the reset --stdin feature on windows path added may have a
\r at the end of the path that wasn't getting removed so didn't match
the path in the index and wasn't reset.

Signed-off-by: Kevin Willford <kewillf@microsoft.com>
---
 t/t7108-reset-stdin.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/t/t7108-reset-stdin.sh b/t/t7108-reset-stdin.sh
index b7cbcbf869296c..db5483b8f10052 100755
--- a/t/t7108-reset-stdin.sh
+++ b/t/t7108-reset-stdin.sh
@@ -29,4 +29,13 @@ test_expect_success '--stdin requires --mixed' '
 	git reset --mixed --stdin <list
 '
 
+
+test_expect_success '--stdin trims carriage returns' '
+	test_commit endline &&
+	git rm endline.t &&
+	printf "endline.t\r\n" >list &&
+	git reset --stdin <list &&
+	test endline.t = "$(git ls-files endline.t)"
+'
+
 test_done