Extract history of novice Git lesson

[gvwilson]

Please add link to repo containing extracted lesson when done.

[drio]

I have created this repo. It contains the git notice lessons' files with its history of commits.

If there are other git lessons that should go here, please clone this repo, create a new dir for the lesson/materials and move them (and their commits) to that new directory. Then send me a pull request.

[gvwilson]

Hi @drio,

Thanks for this - does it trace history back through renames? The oldest commit in the history seems to be:

commit ab0e13d52d7fdef3415b8cbdeeec6d009c859d5d Author: Greg Wilson gvwilson@third-bit.com Date: Sun Feb 16 08:17:08 2014 -0500

Reorganizing material to put novice + intermediate at top level

and we'd like to include the history prior to that reorganization.

Thanks, Greg

[drio]

I am not sure I know how to do that. Has anyone done it for the other topics? Is there any document or script that shows how to do it?

[rgaiacs]

Has anyone done it for the other topics? Is there any document or script that shows how to do this?

https://github.com/wking/swc-modular-shell/issues/3

[gvwilson]

Has anyone done it for the other topics? Is there any document or script that shows how to do this?

https://github.com/wking/swc-modular-shell/issues/3 @r-gaia-cs and/or @wking, can you please walk @drio through the steps?
I couldn't figure it out from the description in that issue alone...

Thanks, Greg

[aaren]

@drio @gvwilson you might find my steps easier to follow

[wking]

On Fri, Nov 28, 2014 at 01:35:09AM -0800, Greg Wilson wrote:

Has anyone done it for the other topics? Is there any document or script that shows how to do this?

https://github.com/wking/swc-modular-shell/issues/3

@r-gaia-cs and/or @wking, can you please walk @drio through the steps? I couldn't figure it out from the description in that issue alone...

I just added some pictures to make the rebase clearer 1. If there's anything that's still murky, let me know and I'll add more comments on that portion of the workflow.

[gvwilson]

Thanks @wking - you're a good man.

[drio]

I am using these instructions (thanks @aaren) to extract history for novice/git but I am still stuck with the removed or moved files. @gvwilson said the first commit with activity for the git/novice directory is ab0e13d52d7fdef3415b8cbdeeec6d009c859d5d.

How can inject the removed files and all its commits between ab0e13d52d7fdef3415b8cbdeeec6d009c859d5d and now in the novice-git-history branch?

[wking]

On Wed, Dec 03, 2014 at 03:12:55PM -0800, David Rio Deiros wrote:

I am using these instructions (thanks @aaren) to extract history for novice/git but I am still stuck with the removed or moved files. … How can inject the removed files and all its commits between ab0e13d52d7fdef3415b8cbdeeec6d009c859d5d and now in the novice-git-history branch?

You run two filter-branch calls: one to pull out the history before the rename, and another to pull out the history after the rename. Then you use rebase to attach the two histories together. Pretty graphs showing such a join around ‘shell-novice’ are here 1. If there's something in that description that's confusing, let me know and I can go into more detail.

[drio]

Thanks @wking.

The commit I am suppose to use to create the branch before the rename doesn't seem to exists:

# In the gh-pages branch:
$ git checkout -b old ab0e13d52d7fdef3415b8cbdeeec6d009c859d
fatal: reference is not a tree: ab0e13d52d7fdef3415b8cbdeeec6d009c859d5d

What commit should I use to pull the old contributions to novice/git?

[wking]

On Wed, Dec 03, 2014 at 03:33:23PM -0800, David Rio Deiros wrote:

The commit I am suppose to use to create the branch before the rename doesn't seem to exists:

I don't have ab0e13d52 (Reorganizing material to put novice + intermediate at top level, 2014-02-16) locally. It sounds like it was part of your filter-branch of the more recent history 1? Anyway, the relevant commit in bc is b8c7dc3b:

$ git rev-parse 'bc/master^{/Reorganizing material}' b8c7dc3b75002b898f26df551a2c646d78e3aaca

which I pull out as ORPHAN_COPY_COMMIT in my notes (wking/swc-modular-shell#3).

[drio]

Ok. Thanks again for you patience @wking.

@gvwilson, you can find the repo with the git materials and the history here.

[wking]

On Wed, Dec 03, 2014 at 04:22:08PM -0800, David Rio Deiros wrote:

https://github.com/drio/novice-git-history.git

One thing I've been working on today (and it looks like you're missing too) is the reference and instructor-guide information [1,2]. See wking/swc-modular-shell#27 for my approach here.

[wking]

Can this be closed now that we have https://github.com/swcarpentry/git-novice?

[drio]

Yes, let's close it.