These were dropped by one of the earlier filter-branch clones (see #4). Just to be clear about which repositories I'm referring to, here are my remote names for this section:
$ git remote -v
bc ssh://[email protected]/swcarpentry/bc.git (fetch)
bc ssh://[email protected]/swcarpentry/bc.git (push)
modular-shell git://github.com:wking/swc-modular-shell.git (fetch)
modular-shell ssh://[email protected]/wking/swc-modular-shell.git (push)
What's the history for gen-sequence.py
in bc?
$ git log --follow --oneline bc/master -- novice/shell/gen-sequence.py
b8c7dc3 Reorganizing material to put novice + intermediate at top level
3a38907 shell: Rename the new-style lessons from 'bash' to 'shell'
f4cc356 Updating index file and moving utility scripts to the right place
a41a27d Renaming directories with example files
03b26ac Example files for intro to shell
Which of those commits are in modular-shell?
$ git log --oneline modular-shell/master | grep 'Reorganizing material\|shell: Rename the new-style\|Updating index file and moving\|Renaming directories with\|Example files for'
c6ac923 Updating index file and moving utility scripts to the right place
09fb561 Renaming directories with example files
c08de6f Example files for intro to shell
Taking a closer look at our breaking commit:
$ git show --oneline --stat c6ac923
c6ac923 Updating index file and moving utility scripts to the right place
creatures/gen-sequence.py | 10 ----------
index.md | 24 ++++++++++++++++--------
2 files changed, 16 insertions(+), 18 deletions(-)
And the bc commit it's based on:
$ git show --oneline --stat --find-copies f4cc356
f4cc356 Updating index file and moving utility scripts to the right place
bash/novice/index.md | 24 ++++++++++++++++--------
bash/util/gen-nene.py | 2 ++
bash/{novice/creatures => util}/gen-sequence.py | 2 ++
3 files changed, 20 insertions(+), 8 deletions(-)
Hmm, so this commit is bumping gen-nene.py
, and we'll have to look at that too. What's its history in bc?
$ git log --follow --oneline bc/master -- novice/shell/gen-nene.py
b8c7dc3 Reorganizing material to put novice + intermediate at top level
3a38907 shell: Rename the new-style lessons from 'bash' to 'shell'
f4cc356 Updating index file and moving utility scripts to the right place
090b60b Put randomly generated data in files
Do we have that first commit in modular-shell?
$ git log --oneline modular-shell/master | grep 'Put randomly generated'
What's it touching there?
$ git show --stat 66cf53e
commit 66cf53e794d8cbbb6be291131045b105d751d39e
Author: Damien Irving <[email protected]>
Date: Fri Nov 29 07:44:39 2013 +1100
Put randomly generated data in files
.../north-pacific-gyre/2012-07-03/NENE01729A.txt | 600 ++++++++++-----------
.../north-pacific-gyre/2012-07-03/NENE01729B.txt | 600 ++++++++++-----------
…
.../north-pacific-gyre/2012-07-03/NENE02043B.txt | 600 ++++++++++-----------
05-scripting/backup/chloratin.dat | 178 +++---
05-scripting/backup/sphag-merged.dat | 344 ++++++------
05-scripting/chloratin.dat | 58 +-
05-scripting/girmanis.dat | 364 ++++++-------
05-scripting/sphag2.dat | 312 +++++------
05-scripting/sphagnoi.dat | 182 +++----
23 files changed, 5759 insertions(+), 5759 deletions(-)
So our filter-branched commit doesn't add gen-nene.py
, because swcarpentry/DEPRECATED-bc@090b60b had added it to a different directory (bash/util/gen-nene.py
). I don't think we want auto-generated content in the repository anyway, so I might try and refactor this bit of history entirely…