PHPBB3-15097 - Board statistics page should show PHP version

[DavidIQ]

Yeah you won't be able to do that on GitHub. You actually needed to do that locally using 'amend' before you made the second commit. Changing a commit from before is a little trickier but can be done. As mentioned before you'll need to do a force push of your branch to get the commit changes out to the pull request.

[P_I]

Thanks again. Please bear with me so I get it correct.
I believe the steps become

Code: Select all

git rebase --interactive 'ac88815^'

which gives me

Code: Select all

pick ac88815 [3.1.x] Add PHP version to Board statistics
pick 29fc038 [ticket/15097] Add PHP version to Board statistics

# Rebase b567c6e..29fc038 onto b567c6e
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#  x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

I change the first 'pick' to 'edit' so I have

Code: Select all

edit ac88815 [3.1.x] Add PHP version to Board statistics
pick 29fc038 [ticket/15097] Add PHP version to Board statistics

# Rebase b567c6e..29fc038 onto b567c6e
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#  x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

Now I execute

Code: Select all

$ git commit --all --amend --no-edit

and then

Code: Select all

git rebase --continue

I would appreciate if you could please confirm these steps.
My local git is telling me the steps are:

Code: Select all

You can amend the commit now, with

        git commit --amend

Once you are satisfied with your changes, run

        git rebase --continue

[DavidIQ]

That looks about right. For the amend step you should get your commit editor, be it Notepad++ or the built-in one from git or whatever else you might have configured and you'll be able to edit the commit message there.

[P_I]

Still confused. I've done the steps as indicated. They seem to have successfully completed but I'm not seeing them updated on github.

FWIW, I'm working on the command line in Linux (CentOS 7).

Code: Select all

$ git --version
git version 1.8.3.1

[DavidIQ]

Did you force push?

Code: Select all

git push origin ticket/15097 -f

Also looks like you're going to have to edit your commit messages again as they're too long:
https://travis-ci.org/phpbb/phpbb/jobs/202771830#L903

Might want to install the commit hooks so these things get sorted out locally.

[P_I]

Thanks for your patience and advice. I've now installed commit hooks.

[P_I]

Wow, what a learning experience. I think I've got the issues resolved. Will wait to see what travis-ci.org reports.

@DavidIQ. 👍 👍 for sticking with me and helping.

[DavidIQ]

Glad to help someone through something most of us have had to go through at some point

So you have some other errors that you'll want to take care of regarding indentation:
https://travis-ci.org/phpbb/phpbb/jobs/202794207#L648

Should be easy to fix in another commit.

[P_I]

Got in done. Passed all tests. Learned a lot in the process that I can apply going forward.

[P_I]

I presume my part of the process is now complete and it's up to someone else to review/approve the pull request and decide if/when this gets included in a phpBB release, i.e. 3.1.11 and/or 3.2.1.

Is there anything more for me to do?