Question

I keep pulling these commands

Macintosh:project david$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   cloud-hosting.html
#   modified:   complete-package.html
#   modified:   css/hosting-1.0.css
#   modified:   css/slider.css
#   new file:   domains.html
#   modified:   index.html
#   modified:   js/bootstrap-slider.js
#
Macintosh:project david$ git commit -m 'test git commit because git is broken' .
Macintosh:project david$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   cloud-hosting.html
#   modified:   complete-package.html
#   modified:   css/hosting-1.0.css
#   modified:   css/slider.css
#   new file:   domains.html
#   modified:   index.html
#   modified:   js/bootstrap-slider.js
#

including every different permutation on git commit that I could find and nothing will let me git push - because it says 'everything up to date'.

I've tried GUI clients that say everything from 'a git error occurred' to 'git error: (null)' I don't even know how to get any further diagnostic information about my git actions...!

In terms of a 'clean system' I'm far from that, and I think this might have something to do with it -- I recently upgraded to mavericks, changed over my Xcode implementation and upgraded Xcode command line tools because Coda needed it (it couldn't find my old git client)

Does changing your git client change anything? (Should it)

Thanks

Was it helpful?

Solution

This seems to be a case of a corrupted repo caused by either

a) Upgrading to mavericks and its subsequent upgrade of Xcode b) The Xcode upgrade incurred a few hiccups through its upgrade in itself as my RAM was corrupt and causing hourly kernel panics, just after my mavericks upgrade c) Then, Coda 2 asked to reinstall Xcode command line tools, as it was experiencing a known issue where this was the fix. To cap it all off, I cancelled this download once because I was on a bus and my iPhone internet coverage was poor. d) Definitely my git binary and probably my git version changed throughout this process, and it was a long time since my last commit to that repository.

Definitely a corrupted repository, as confirmed by the reclone and remodification which worked.

In terms of repeatability, I don't think this will come up ever due to the highly idiosyncratic circumstances. I think we can mark this one as an anomalous case, and reaffirm our faith in git.

In git we trust.

Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top