I spoke with mdc & mcb30 this morning during our weekly meeting. My commits contained both code changes and formatting changes, intermingled, which made reviewing the code difficult. So the previous commits need to be respun to make for easier review.
I found that my existing commits contained too much variation to be cleaned up without making more fine-grained commits. Thus, I spent the day working on this. I had some trouble with git, mainly in that I managed to spend a few hours making new commits only to realize I had not replaced the spaces with tabs (argh!). So I had to start over. At this point I'm still respinning so I have no commit to post tonight.
This should be a one-time event as SCM and making commits is all new to me. From now on I plan to make fine-grained commits such that my code is reviewable. (As the ultimate goal of my code is a positive review.)
Spent the day attempting to respin, although it was slow-going as small problems with git added up into redoing things many times. Spent quite some time trying to find the cause of changes git reported that looked like identical lines. Discovered pasting code from Firefox inserts weird line feeds which were getting converted when I reopened the file. Realized git-cherry-pick will create a new commit if it succeeds, but will not create a new commit if it fails. I think. Expect to push soon.
Reached a point where I wouldn't mind pushing, although more respinning is still pending. However, git spat out a mysterious error:
$ git-push personal drivers4 mdeck@rom.etherboot.org's password: fatal: invalid number of threads specified (0) $ git-gc fatal: invalid number of threads specified (0) error: failed to run repack
I don't know what caused this to suddenly happen, but now I can not push from any repository or branch. I spent a few hours working with Marty to fix this, but for now we decided I would use a work-around by uploading the repository to rom.etherboot.org and pushing from there, which works.
More commits on the way.
–
Solved!!
Shortly later Marty mentioned something in ~/.gitconfig
, whereupon I found a setting:
[pack] threads = 0
Which I promptly changed to:
[pack] threads = 1
Which fixed the problem! I must have accidentally changed that setting and caused such headaches.