Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.13.2 2017-01-31T21:15:00Z 2017-01-31T21:15:00Z Junio C Hamano gitster@pobox.com 2017-01-31T21:15:00Z urn:sha1:b7786bb4b09463641f3e39eca18aefc630ee4f38 Rewrite a scripted porcelain "git difftool" in C. * js/difftool-builtin: difftool: hack around -Wzero-length-format warning difftool: retire the scripted version difftool: implement the functionality in the builtin difftool: add a skeleton for the upcoming builtin 2017-01-19T21:23:43Z Johannes Schindelin johannes.schindelin@gmx.de 2017-01-19T20:30:40Z urn:sha1:019678d6b1f83419cdc35e3d455175adce3a379c It served its purpose, but now we have a builtin difftool. Time for the Perl script to enjoy Florida. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-12-27T23:33:13Z Elia Pinto gitter.spiros@gmail.com 2015-12-22T14:10:27Z urn:sha1:bc32bacc72078b92b9e9f02acec63ccc28564a01 The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-12-27T23:33:13Z Elia Pinto gitter.spiros@gmail.com 2015-12-22T14:10:26Z urn:sha1:6ccca67a74807c14970d08efd635bdef9af6c17c The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-12-27T23:33:13Z Elia Pinto gitter.spiros@gmail.com 2015-12-22T14:10:25Z urn:sha1:1a3655264ebb238692b3666afe338e094fdb3609 The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-12-27T23:33:13Z Elia Pinto gitter.spiros@gmail.com 2015-12-22T14:10:24Z urn:sha1:cc301d7e5193801208588cbd54cf1af91b6f7a00 The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-12-27T23:33:13Z Elia Pinto gitter.spiros@gmail.com 2015-12-22T14:10:23Z urn:sha1:a22c9e8d9e29277f51b77aff8d0eee3945577e72 The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-10-14T21:30:21Z Junio C Hamano gitster@pobox.com 2015-10-14T21:30:20Z urn:sha1:1311587d96e0bff17a34dc9bb9ad27c3abdacdbc * pt/pull-builtin: merge: grammofix in please-commit-before-merge message 2015-10-02T21:29:56Z Alex Henrie alexhenrie24@gmail.com 2015-10-02T04:25:33Z urn:sha1:b7447679e84ed973430ab19fce87f56857b83068 Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-09-14T21:59:13Z Junio C Hamano gitster@pobox.com 2015-09-14T21:59:07Z urn:sha1:cf2094ca6349fe8cfe0f327e36ea386ad8ac98db Recent versions of scripted "git am" has a performance regression in "git am --skip" codepath, which no longer exists in the built-in version on the 'master' front. Fix the regression in the last scripted version that appear in 2.5.x maintenance track and older. * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index