Last modified: 2014-01-04 19:23:00 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T47802, the corresponding Phabricator task for complete and up-to-date bug report information.
Bug 45802 - Edit commit message in browser gives a multi line summary on gerrit
Edit commit message in browser gives a multi line summary on gerrit
Status: RESOLVED FIXED
Product: Wikimedia
Classification: Unclassified
Git/Gerrit (Other open bugs)
wmf-deployment
All All
: Low minor (vote)
: ---
Assigned To: Nobody - You can work on this!
https://gerrit.wikimedia.org/r/#/c/52...
: upstream
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-03-06 19:47 UTC by Umherirrender
Modified: 2014-01-04 19:23 UTC (History)
6 users (show)

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---


Attachments

Description Umherirrender 2013-03-06 19:47:41 UTC
I have edit the commit message of Gerrit change #52439 with the browser (IE8). The short summary is now longer than one line.

See
https://gerrit.wikimedia.org/r/#/q/owner:%22Umherirrender+%253Cumherirrender_de.wp%2540web.de%253E%22+project:mediawiki/extensions/ConfirmEdit,n,z
Comment 1 Krinkle 2013-03-06 19:51:40 UTC
The commit message should have the following format[1]:

> Subject (MUST be < 62 chars)\n
> \n
> Body

Though it is not documented on the wiki page, the problem is that you were using Windows-style CR line breaks instead of LF.

Gerrit apparently only looks for LF, not CR. Which I think is fine since it is our convention not to use CR (When checking the diff in git on the command line it will warn for CR as well). Be sure to configure your editor to not use CR.

Different layers on git will do it differently. I see that on GitHub it will separate the subject by either LF or CR. Gerrit does not. You could file an upstream issue.

https://gerrit.wikimedia.org/r/#/c/52439/2//COMMIT_MSG

[1] https://www.mediawiki.org/wiki/Git/Commit_message_guidelines
Comment 2 Krinkle 2013-03-06 19:52:52 UTC
Hm.. did it only start doing this *after* you edited in the browser?

Because in that case it is probably something the Gerrit inline editor should guard against by enforcing LF when saving.
Comment 3 Umherirrender 2013-03-06 20:03:30 UTC
Yes, the first commit was fine. Maybe the IE is inserting the wrong line seperator or the inline editor should normalize it.
Comment 4 Umherirrender 2013-03-06 20:04:17 UTC
See diff: https://gerrit.wikimedia.org/r/#/c/52439/1..2//COMMIT_MSG
Comment 5 Marcin Cieślak 2013-03-06 20:28:02 UTC
Confirmed using IE7 on my own copy of Gerrit running 2.5.2-1365-g7609714
Comment 6 Krinkle 2013-03-18 08:34:58 UTC
Filed upstream report: https://code.google.com/p/gerrit/issues/detail?id=1830
Comment 7 christian 2013-03-19 07:05:02 UTC
The upstream fix was accepted in commit
109e03fe2bdd3e5420ccf88c9bc723585ffab60e

https://gerrit-review.googlesource.com/#/c/43582/
Comment 8 Umherirrender 2014-01-04 19:23:00 UTC
upstream fix was labeled with: FixedIn-2.6
Wikimedia is running now 2.7-rc2-507-g1e7090b, so this should be fixed.

Note You need to log in before you can comment on or make changes to this bug.


Navigation
Links