Merge 'gvfs-preamble' into HEAD

Author: dscho

builtin/reset.c

@@ -327,7 +327,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 
 	if (read_from_stdin) {
 		strbuf_getline_fn getline_fn = nul_term_line ?
-			strbuf_getline_nul : strbuf_getline_lf;
+			strbuf_getline_nul : strbuf_getline;
 		int flags = PATHSPEC_PREFER_FULL;
 		struct strbuf buf = STRBUF_INIT;
 		struct strbuf unquoted = STRBUF_INIT;

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