New commit to BC which modifies shell stuff.

[swcarpentry]

New commit to BC which modifies shell stuff.

[wking]

On Sun, Nov 02, 2014 at 03:15:19PM -0800, Gabriel A. Devenyi wrote:

swcarpentry/DEPRECATED-bc#789

Here's what we have:

$ git log --graph --topo-order --oneline --decorate | head -n2

• a8a8643 (HEAD, modular-shell/master, novice-shell) Minor wording changes
• 9cde165 Small Grammatical Change to List Format

And here's what's in bc:

$ git log --graph --topo-order --oneline --decorate bc/gh-pages -- novice/shell | head -n3

• e28d108 (origin/pr/789) only keep n,median; remove mean,min,max
• 4f5652b times for shell, python, git, sql
• 99e5149 (origin/pr/754) Small Grammatical Change to List Format

The “only keep n,median…” commit is older, but it was merged later
(2014-11-02 1 vs 2014-10-24 2), so we'll add it after in our
series. Where did the swcarpentry/DEPRECATED-bc#789 branch leave bc?

$ git log -1 --date=short --pretty=format:'%h %ad %s' 4f5652b^
5c59eac 2014-10-08 Merge pull request #783 from fmichonneau/menu-bar-firefox

Is that after “Small Grammatical Change…”?

$ git log -1 --date=short --pretty=format:'%h %ad %s' 9cde165
9cde165 2014-09-26 Small Grammatical Change to List Format

yes. So let's re-create the pull request based from our “Small
Grammatical Change…”:

$ git checkout -b wip-pr 9cde165
$ git cherry-pick 4f5652b e28d108
$ git rm -rf novice/
$ git cherry-pick --continue
$ git rm -rf novice/
$ git cherry-pick --continue

What was the merge commit?

$ git log --oneline --first-parent bc/gh-pages | grep '#789'
81b77c3 Merge pull request #789 from chendaniely/time-estimates

Re-create that merge after our “Minor wording changes” (because it
landed later, as I mentioned earlier):

$ git checkout novice-shell
$ NAME=$(git show --pretty=format:%an 81b77c3)
$ EMAIL=$(git show --pretty=format:%ae 81b77c3)
$ DATE=$(git show --pretty=format:%ad 81b77c3)
$ MESSAGE=$(git show --pretty=format:%B 81b77c3)
$ GIT_AUTHOR_NAME="${NAME}" GIT_AUTHOR_EMAIL="${EMAIL}" GIT_AUTHOR_DATE="${DATE}" git merge -m "${MESSAGE}" --no-ff wip-pr

How does it look?

$ git log --graph --topo-order --oneline --decorate | head -n 7

• 02e76a5 (HEAD, novice-shell) Merge pull request #789 from chendaniely/time-estimates
  |\
  | * bb36f97 (wip-pr) only keep n,median; remove mean,min,max
  | * a474dc3 times for shell, python, git, sql
• | a8a8643 (modular-shell/master) Minor wording changes
  |/
• 9cde165 Small Grammatical Change to List Format

Good. Remove the temporary branch:

$ git branch -d wip-pr

And publish:

$ git push -f modular-shell novice-shell:master

Cheers,
Trevor