1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 18:44:37 +02:00
Commit Graph

89 Commits

Author SHA1 Message Date
9068909051 [ticket/15683] Better error message when commit message has CRLF
When someone tries to do a pull request with incorrect line breaks in the
commit message, the error message as given by Travis is "Unexpected EOF
encountered". The error message should be clearer that CR/LF was the
problem. This change adds a separate check for CRLF line endings.

PHPBB3-15683
2018-06-05 22:20:19 +03:00
0d17b32e25 [ticket/11611] Remove no longer used file for setting up git repository
PHPBB3-11611
2017-01-16 20:57:06 +01:00
0b106ab0e3 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12720] Allow commit heading to begin with lowercase letters
2014-06-16 15:28:26 +02:00
6db849cba5 [ticket/12720] Allow commit heading to begin with lowercase letters
PHPBB3-12720
2014-06-16 18:55:19 +05:30
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
42e8c2e8cf [ticket/11509] Exit with the expected (non-zero) exit status on failure.
PHPBB3-11509
2014-02-21 01:48:55 +01:00
fe5858902e [ticket/11509] Output which commit is being inspected.
PHPBB3-11509
2014-02-21 01:47:45 +01:00
ccd30912d9 [ticket/11509] Three dots means sym. difference, but we only want new commits.
PHPBB3-11509
2014-02-21 01:47:37 +01:00
16e81d4d18 [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.
PHPBB3-11509
2014-02-02 17:11:30 +01:00
300867ab1a [ticket/11630] Improvements to the PHP lint pre-commit hook
The PHP lint pre-commit hook fails to display any output when an error
other than a parse error is decteced.

Additionally, the hook may not display any meaningful output depending
on php.ini settings. This commit removes the dependency on php.ini.

PHPBB3-11630
2013-07-06 12:16:59 -05:00
b362fb44d2 [ticket/11603] Fix out dated comment
PHPBB3-11603
2013-06-20 10:59:43 +02:00
5f4daba160 [ticket/11603] Fix usage note
PHPBB3-11603
2013-06-20 10:57:56 +02:00
99e486dc82 [ticket/11603] Throw RuntimeExceptions instead of using exit()
PHPBB3-11603
2013-06-19 13:45:42 +02:00
1516ae7e7e [ticket/11603] Avoid using cURL
PHPBB3-11603
2013-06-19 13:38:03 +02:00
a7af0134c0 [ticket/11603] Split api_request into two functions (query only vs. full url)
PHPBB3-11603
2013-06-13 18:43:04 +02:00
92c55ab111 [ticket/11603] Fix spacing and add some comments
PHPBB3-11603
2013-06-13 18:41:23 +02:00
e4ccc5e6ea [ticket/11603] Fix github API calls
- Some URLs changed
- Response is a plain array now
- Added error messages when API limit is reached

PHPBB3-11603
2013-06-13 16:17:17 +02:00
bcc98ae3e7 [ticket/11603] Rename network to forks and fix handling
PHPBB3-11603
2013-06-13 16:16:58 +02:00
e633ace072 [ticket/11603] Fix github api url and use curl with valid user agent
PHPBB3-11603
2013-06-13 16:16:44 +02:00
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
aceca2566b [ticket/10767] Clarify what happens at the end of the hook.
If there are problems and fatal is true, print that the commit
is aborted.

If there are problems and fatal is false, print instructions
for fixing the commit.

PHPBB3-10767
2012-04-17 06:05:33 -04:00
45b910f9b4 [ticket/10767] Use warning/error language as appropriate.
When commit-msg hook is fatal, label the message as an error.

When it is not fatal, label the message as a warning.

"Syntax error" is still always an error, not sure if this
should be changed.

PHPBB3-10767
2012-04-17 06:05:32 -04:00
1ce8a1d7ee [ticket/10767] Default to non-fatal behavior.
PHPBB3-10767
2012-04-17 06:05:32 -04:00
bdf21e45ca [ticket/10767] Revert unconditional unfatality in commit-msg hook.
Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic."

This reverts commit 88cad5523e.

PHPBB3-10093
PHPBB3-10767
2012-04-16 03:05:42 -04:00
dc63db1860 [ticket/10760] Fix numbering in php fun facts.
PHPBB3-10760
2012-04-04 11:43:59 -04:00
efdd1e623e [ticket/10760] Value must be quoted as it might be two words.
PHPBB3-10760
2012-04-04 11:41:14 -04:00
6536a36208 [ticket/10760] PHP is great. This commit is the proof.
PHPBB3-10760
2012-04-04 00:27:06 -04:00
f2967b6669 [ticket/10760] Catch both versions of parse error output in php.
PHPBB3-10760
2012-04-04 00:01:08 -04:00
a0da2408e7 [ticket/10760] Account for display_errors=stderr in pre-commit hook.
With that php.ini value set errors are printed to stderr, therefore
by redirecting stderr to /dev/null we also throw out the errors.

Instead merge stderr into stdout.

PHPBB3-10760
2012-04-03 23:18:33 -04:00
b803fc4351 [ticket/10760] Quote PHP_BIN when using it.
This should make a difference on windows where paths may include spaces.

PHPBB3-10760
2012-04-03 23:14:44 -04:00
786fcbf212 [ticket/10760] Use echo -e only if echo understands -e.
/bin/echo on freebsd and dash's builtin echo do not understand -e,
therefore -e is printed with the other messages in such cases.

Test if echo understands -e, if not do not use it.

PHPBB3-10760
2012-04-03 23:06:50 -04:00
57209a1e68 [ticket/10760] Use externally specified PHP_BIN if any.
We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.

Instead set PHP_BIN if it is not set.

Now one can set PHP_BIN in their environment to use a non-default
php binary.

PHPBB3-10760
2012-04-03 23:05:15 -04:00
5e52734c24 [ticket/9916] Changing header in non-distributed files
PHPBB3-9916
2012-01-02 16:20:30 +00:00
8e59699424 [ticket/10093] Use correct ANSI code for clearing color.
PHPBB3-10093
2011-12-03 16:43:13 -05:00
88cad5523e [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.
PHPBB3-10093
2011-12-03 16:41:31 -05:00
92cdf08d48 [ticket/10093] Use color in commit-msg hook warning/error messages.
By default color is used if the message is printed to a tty,
phpbb.hooks.commit-msg.color configuration setting can override this.

PHPBB3-10093
2011-11-26 18:06:38 -05:00
6a3ee0996e [ticket/10093] Refactor complaining in commit-msg hook for color support.
PHPBB3-10093
2011-11-26 17:41:25 -05:00
26d01d4408 [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.
PHPBB3-10093
2011-11-26 17:35:35 -05:00
0cb83f99ab [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
PHPBB3-10093
2011-11-26 17:32:40 -05:00
cd9355e4dd Merge remote branch 'igorw/ticket/9806' into develop-olympus
* igorw/ticket/9806:
  [ticket/9806] Script for merging pull requests
2011-03-20 22:31:14 +01:00
4f1056ad72 Merge branch 'ticket/p/10092' into develop-olympus
* ticket/p/10092:
  [ticket/10092] Ignore overlength comment lines in commit-msg hook.
2011-03-14 13:58:19 +01:00
1d2634f0ee [ticket/9806] Script for merging pull requests
PHPBB3-9806
2011-03-13 16:15:24 +01:00
94e09ac041 [ticket/10078] Avoid \n in strings given to echo for portability.
Also preserve whitespace (including newlines) when printing the
lines that exceed 80 character limit.

PHPBB3-10078
2011-03-11 19:30:40 -05:00
7cf134c73d [ticket/10092] Ignore overlength comment lines in commit-msg hook.
PHPBB3-10092
2011-03-11 19:26:07 -05:00
e552287128 [ticket/9824] Accept commit messages with less than perfect headings.
Some commit messages exist only temporarily, because they are given
on commits that are intended to be squashed. Accept such commit
messages with a warning.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
d7a38fd7ef [ticket/9824] Allow empty lines after ticket reference.
PHPBB3-9824
2011-03-01 20:59:04 -05:00
b90e01392c [ticket/9824] Use printf instead of echo to render \n.
On FreeBSD `echo "\n"` prints \n verbatim. Use printf instead.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
c489b189df [ticket/9824] Handle empty commit messages in commit-msg hook.
Git already handles the case of commit message being empty by
aborting the commit and displaying a reasonably helpful message.
If there is no commit message, the hook will exit with success
exit code to let git do its thing.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
9bed2b119c [ticket/9824] Add space after [ticket/12345] in prepared commit message.
PHPBB3-9824
2011-03-02 00:24:34 +01:00
16a46e6a24 [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
PHPBB3-9824
2011-03-02 00:04:45 +01:00