check contents of history

[aaren]

@ashwinsrnth can you check the history over and see if it's all there?

If you would like to take custody of this and look after any subsequent pull requests, I can show you the commands to extract the history and you can create your own.

[aaren]

@gvwilson @r-gaia-cs @wking @ashwinsrnth transferred from email discussion:

why is Isabell missing from the contributors list?

[shwina]

Thank you, Aaron - yes, I can do that. Also, @IsaKiko is missing from the 'contributors' page (both here and in bc). I'm not sure why :(

[aaren]

I think the reason is

1) The latest commit by IsaKiko is a merge commit 2) All previous commits are made with an unrecognised email address (kiko@Kikos-MacBook-Air.local) - github isn't recognising this as a user.

[aaren]

What we could do is alter the commit messages to have a correct email address. At minimum we can use IsaKiko@users.noreply.github.com, but maybe @IsaKiko would like something else?

[shwina]

@ashwinsrnth can you check the history over and see if it's all there?

Is there a better way than checking the history of each file?

If you would like to take custody of this and look after any subsequent pull requests, I can show you the commands to extract the history and you can create your own.

Whenever you're ready :)

[aaren]

@ashwinsrnth have a look at the contributors now. Fixed with env-filter:

git filter-branch --env-filter 'if test "$GIT_AUTHOR_NAME" = "IsaKiko"
then
GIT_AUTHOR_EMAIL="IsaKiko@users.noreply.github.com" GIT_AUTHOR_NAME="Isabell Kiral-Kornek"
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
fi
' --force

[shwina]

Aaron - awesome! Thanks so much

[aaren]

Is there a better way than checking the history of each file?

you could compare against bc, e.g. git log novice/mattlab in the bc repo.

Also if there are any reorganisations that I don't know about then check that they have been captured (although I think it is pretty simple for this one).

[aaren]

really it's just to have a second pair of eyes looking over it.

[aaren]

As to the method, you could follow my instructions on swcarpentry/bc/issues/877, and miss out the stuff about attaching history (not relevant here).

I actually did it a slightly different way here though:

git clone https://github.com/swcarpentry/bc

mkdir swc-novice-matlab
cd swc-novice-matlab
git init

git remote add bc ../bc
git fetch bc
git checkout bc/gh-pages
git checkout -b novice-matlab-history
git filter-branch --subdirectory-filter novice/matlab --prune-empty

then alter IsaKiko's commits as above.

[shwina]

@aaren Thank you. I'll have this done soon. Here is a question that might be a bit silly: Where is the "definitive" version of the lessons going to finally reside?

[aaren]

Where is the "definitive" version of the lessons going to finally reside?

excellent question! It isn't particularly clear which is why I'm drafting a blog post to iron all these questions out.

The extracted history (swc-novice-matlab) lives as one of your personal repos. You create an issue on bc labeled with Extract History with a link to your personal repo so that people know where to look for it. At some point your personal repo will be used as the basis for swcarpentry/novice-matlab and made to fit the lesson-template.

[shwina]

Understood - thank you, Aaron

[IsaKiko]

Hi there, Is there a way for me to fix the weird email it shows for me? Sorry if that's been holding anyone up..

[shwina]

Hi, @IsaKiko

There's no problem (you are now on the contributors list), and it hasn't held anything back! So no worries at all

[IsaKiko]

That's good, thanks! And I think I may have found how to convince my Mac to display my real email address so all is good for future commits.

[aaren]

@IsaKiko you can set your email with git config --global user.email "your_email@example.com". See this page for more info.

I changed your email in all of your commits to be the default Github one (IsaKiko@users.noreply.github.com). This lets Github recognise you as a contributor without disclosing a real email address. If you'd like to have a real email address in the commits then we can do that as well - it's up to you.

[shwina]

@aaren I followed your steps, and here's what I ended up with:

https://github.com/ashwinsrnth/swc-novice-matlab

I hope everything looks OK (the history is alright and all contributors are included). What about branches? Should I push gh-pages?

[aaren]

The branch name doesn't really matter as it will be pulled from whatever it is- you could use master if you wanted. What you have is just fine.

You can now create an issue on bc, with the 'Extract History' label and a link to your repository (follow the theme of those already in there), Then self assign yourself to the issue.

On 10 December 2014 at 17:48, Ashwin Srinath notifications@github.com wrote:

@aaren https://github.com/aaren I followed your steps, and here's what I ended up with:

https://github.com/ashwinsrnth/swc-novice-matlab

I hope everything looks OK (the history is alright and all contributors are included). What about branches? Should I push gh-pages?

— Reply to this email directly or view it on GitHub https://github.com/aaren/swc-novice-matlab/issues/1#issuecomment-66492389 .

[aaren]

Looks to me like you've got it under control :smile:

[shwina]

Thanks for the help, @aaren :)