Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 21 Apr 2015 13:34:54 UTC Commit: 96cc37946f24ba8ff203cbfed5e816b966fa95d6 https://github.com/geany/geany/commit/96cc37946f24ba8ff203cbfed5e816b966fa95...
Log Message: ----------- Scintilla update script: strip "a/" and "b/" automatically
Modified Paths: -------------- scripts/update-scintilla.sh
Modified: scripts/update-scintilla.sh 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -56,8 +56,7 @@ done git apply -p0 scintilla/scintilla_changes.patch || { echo "scintilla_changes.patch doesn't apply, please update it and retry." echo "Changes for the catalogue are:" - git diff -p -R scintilla/src/Catalogue.cxx | tee - echo "Make sure to strip the leading a/ and b/!" + git diff -p -R --src-prefix= --dst-prefix= scintilla/src/Catalogue.cxx | cat exit 1 }
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).