Arguments starting with '@@' are no paths

dscho · Git for Windows Build Agent · commit 399fd28c289e · 2019-04-30T20:12:29.000Z
... so let's skip posix-to-windows conversion on such parameters.

This fixes Git's t1508-at-combinations.sh.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/winsup/cygwin/msys2_path_conv.cc b/winsup/cygwin/msys2_path_conv.cc
@@ -381,6 +381,11 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en
                     goto skip_p2w;
             }
             break;
+        case '@':
+            // Paths do not contain '@@'
+            if (it + 1 < end && it[1] == '@')
+                goto skip_p2w;
+        }
         ++it;
     }
     it = *src;

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,11 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en`
`381`	`381`	`goto skip_p2w;`
`382`	`382`	`}`
`383`	`383`	`break;`
	`384`	`+ case '@':`
	`385`	`+ // Paths do not contain '@@'`
	`386`	`+ if (it + 1 < end && it[1] == '@')`
	`387`	`+ goto skip_p2w;`
	`388`	`+ }`
`384`	`389`	`++it;`
`385`	`390`	`}`
`386`	`391`	`it = *src;`