22:54 ` Seth House 1:17 ` Junio C HamanoĠ siblings, 1 reply 24+ messages in threadįrom: Junio C Hamano 1:17 UTC ( / raw) They're set up locally) with this included and I'll send a v10 once The elegant fix! I'm running the test suite on Windows and OSX (now that I was (very slowly) converging on that as the culprit. To: David Aguilar +Cc: Junio C Hamano, Felipe Contreras, brian m. 23:18 ` Junio C Hamano 1 sibling, 1 reply 24+ messages in thread The commit message now mentions POSIXLY_CORRECT. "\r" is not valid on Linux with POSIXLY_CORRECT. "\r\?" in sed is not portable to macOS and possibly others. To: Junio C Hamano, Seth House, Felipe Contreras, brian m. carlson 22:42 ` David Aguilarġ sibling, 2 replies 24+ messages in threadįrom: David Aguilar 22:42 UTC ( / raw) * fixup! mergetool: add automerge configuration.I think the former is clearer, since that's what we were writing before. Unfortunately, printf is not specified by POSIX to take hex escapes, so > git merge-file -diff3 -marker-size=7 -q -p "$LOCAL" "$BASE" "$REMOTE" >"$DIFF3" > diff -git a/git-mergetool.sh b/git-mergetool.sh > 1 file changed, 10 insertions(+), 3 deletions(-) > Let me know if you'd prefer a separate patch. > (with the addition of my sign-off) if desired. > This is based on top of fc/mergetool-automerge and can be squashed in The statement about "\r" is also true for Linux > Replace "\r" with a substituted variable that contains "\r".Īh, yes, this is true. > The use of "\r\?" in sed is not portable to macOS and possibly To: David Aguilar +Cc: Junio C Hamano, Seth House, Felipe Contreras, git carlsonĠ siblings, 2 replies 24+ messages in threadįrom: brian m. 21:49 fixup! mergetool: add automerge configuration David 21:59 ` brian m. * Re: fixup! mergetool: add automerge configuration.^ raw reply related 24+ messages in thread Git merge-file -diff3 -marker-size=7 -q -p "$LOCAL" "$BASE" "$REMOTE" >"$DIFF3" I figured we'd wantġ file changed, 10 insertions(+), 3 deletions(-)ĭiff -git a/git-mergetool.sh b/git-mergetool.sh Let me know if you'd prefer a separate patch. (with the addition of my sign-off) if desired. This is based on top of fc/mergetool-automerge and can be squashed in Replace "\r" with a substituted variable that contains "\r". The use of "\r\?" in sed is not portable to macOS and possibly To: Junio C Hamano, Seth House, Felipe Contreras +Cc: git carlson 0 siblings, 1 reply 24+ messages in threadįrom: David Aguilar 21:49 UTC ( / raw) Fixup! mergetool: add automerge configuration archive mirror help / color / mirror / Atom feed * fixup! mergetool: add automerge configuration 21:49 David Aguilar
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |