Fixes #1199 - Simple bugform.js cleanup

[laghee]

r? @miketaylr

[miketaylr]

Looks great! The only thing we need to do before landing is squash the two commits into one.

You can do that in a number of ways, but the simplest (for me, anyways) is via an interactive rebase:

git rebase -i HEAD~2

Then you want to mark the second commit as the one to be squashed, by changing pick to s or squash:

Save that file, then you need to push back the new, single commit to this PR by doing the following:

git push -f

[miketaylr]

(let me know if that's confusing, i can also do it for you if you'd prefer!)

[laghee]

I think I did it successfully. It was confusing at first because the difference between ~ and - was not apparent when looking at the email update rather than the actual thread on GitHub!

[miketaylr]

I think I did it successfully. It was confusing at first because the difference between ~ and - was not apparent when looking at the email update rather than the actual thread on GitHub!

Ah, yeah -- depending on the font I bet that could be confusing! I still see 2 commits. Are you sure you pushed the single commit with git push -f?

You can also check by logging out the last 2 commits and making sure yours is only the first one via something like git log -n 2.

[laghee]

I have a feeling I missed something with the push. It looks like I squashed it locally, but maybe I'm missing something fundamental in pushing? The git push command defaults to origin, right? So maybe I should have specifically done git push -f origin issues/1199/2?

[miketaylr]

So maybe I should have specifically done git push -f origin issues/1199/2?

That looks about right. For me, my first push typically looks like git push --set-upstream origin issues/NNN/N/N, so git push -f will default to what i set the upstream to.

[laghee]

For me, my first push typically looks like git push --set-upstream origin issues/NNN/N/N, so git push -f will default to what i set the upstream to.

That sounds eminently sensible. I wish I had done that.

So, leery of making things worse, I nonetheless tried re-pushing to the correct branch. It looks like there's now only one commit on issues/1199/2, so that seems fixed, but I'm not entirely sure I didn't do something dopey beneath the hood. 🤞🏻 I apologize to be making your job harder!

[laghee]

Hi, @miketaylr, when you get a chance could you let me know if I managed to send the squashed commits correctly?

[denschub]

Looks great, there is only one little nag left: The commit message contains the same message ... twice! That's no big deal and we probably could edit that when merging (maybe Mike is doing that), but if you want, you can call git commit --amend and edit the commit message so it does not appear twice. After that, force-push again and you should be done!

Thanks for your patience. I know it can be confusing at first... :)

(jumping in since Mike is probably busy with some work traveling)

[miketaylr]

@laghee yep -- it did work! \o/

Like @denschub said, could you tweak the commit message so it's not duplicated on different lines?

git commit --amend
(delete second line of commit message, save file)
git push -f (or whatever magic git command you just used to push the new commit!)

thx!

[laghee]

Thanks, @denschub and @miketaylr! I amended and pushed again. I appreciate all the hand-holding! 🤓

[miketaylr]

Awesome! Thanks @laghee