I just did a git pull and ran out of disk space halfway through, which
left me with a bunch of "Could not create file <filename>" errors. I
freed up space and tried to repeat the git pull. Now my repo is
b0rked:
$ git pull
Updating eedace8..a37dbb1
error: Your local changes to the following files would be overwritten by merge:
<list of some of the pulled files>
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
<a lot more of the pulled files>
I wasn't sure how to fix this, and this was probably the wrong
response, but I tried "git add . ; git commit -a -m test ; git push"
and got a bunch of merge conflicts due to zero-length binary files
(PNGs etc.). Repeating this again I get "up to date" but some of my
files have now been replaced in the repo with zero-length versions,
which seems dangerous if I didn't notice it and just assumed that git
had worked its magic and fixed the situation.
I know that gracefully handling out-of-diskspace situations is a pain,
and it's hard to catch each corner case. But it seems like git could
degrade a little more elegantly in this situation (e.g. files should
not just be created with zero length if there is no disk space left).
Thoughts?
Not sure of the right way to fix my current situation, I'll probably
just overwrite my local copy of the repo with a remote copy using scp
and then try pushing again.
I assume this mailing list is the right place to report bugs, since I
don't see a bug tracker? I tried looking in the FAQ at
https://git.wiki.kernel.org/index.php/GitFaq , but got:
Database error
A database error has occurred
Query: SELECT lc_value FROM `l10n_cache` WHERE lc_lang = 'en' AND
lc_key = 'deps' LIMIT 1
Function: LCStore_DB::get
Error: 1146 Table 'gitwiki.l10n_cache' doesn't exist (127.0.0.1:4040)
Thanks,
Luke Hutchison
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html