blocks|key|1356606|text|Git+checkout实际上可以从修订版中挑选出单个文件。只需提供提交散列和文件名即可。更多详细信息here.|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1356607|我想安全修复这个问题的最简单方法是恢复到最新的未提交备份，然后从新提交的文件中有选择地挑选未损坏的文件。祝好运!|1356608|entityMap|0|LINK|mutability|MUTABLE|url|http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/^0|1F|5|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]]|C|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|C|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|C|$]]]|G|$H|$5|I|J|K|C|$L|M]]]]

Git checkout can actually pick out individual files from a revision. Just give it the commit hash and the file name. More detailed info <a href="http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/" rel="nofollow noreferrer">here.</a>

I guess the easiest way to fix this safely is to revert to the newest uncommited backup and then selectively pick out uncorrupted files from newer commits. Good luck!

blocks|key|1356663|text|在以前的一些备份中，您的坏对象可能已经打包到不同的文件中，也可能是松散的对象。因此，您的对象可能会被恢复。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1356664|你的数据库中似乎有一些坏的对象。所以你可以用手工的方式来做。|1356665|由于git+hash-object，git+mktree和git+commit-tree不写入对象，因为它们可以在包中找到，然后开始这样做：|offset|length|style|CODE|1356666|mv+.git/objects/pack/*+<somewhere>
for+i+in+<somewhere>/*.pack;+do
++git+unpack-objects+-r+<+$i
done
rm+<somewhere>/*|code-block|syntax|javascript|1356667|(您的包从存储库中移出，并再次在其中解包；现在只有好的对象在数据库中)|1356668|您可以执行以下操作：|1356669|git+cat-file+-t+6c8cae4994b5ec7891ccb1527d30634997a978ee|1356670|并检查对象的类型。|1356671|如果类型是blob:从以前的备份中检索文件的内容(使用git+show、git+cat-file或git+unpack-file；然后可以使用git+hash-object+-w重写当前存储库中的对象。|1356672|如果类型是树:您可以使用git+ls-tree从以前的备份中恢复树；然后使用git+mktree将其重新写入当前存储库中。|1356673|如果类型为commit:与git+show、git+cat-file和git+commit-tree相同。|1356674|当然，在开始此过程之前，我会备份您的原始工作副本。|1356675|另外，请看一下How+to+Recover+Corrupted+Blob+Object。|1356676|entityMap|0|LINK|mutability|MUTABLE|url|http://www.kernel.org/pub/software/scm/git/docs/v1.7.10.1/howto/recover-corrupted-blob-object.txt^0|0|0|2|F|I|A|T|F|0|0|0|0|0|0|R|8|10|C|1D|F|1Z|I|0|C|B|12|A|0|D|8|M|C|Z|F|0|0|7|10|0|0^^$0|@$1|2|3|4|5|6|7|1E|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1F|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|1G|8|@$F|1H|G|1I|H|I]|$F|1J|G|1K|H|I]|$F|1L|G|1M|H|I]]|9|@]|A|$]]|$1|J|3|K|5|L|7|1N|8|@]|9|@]|A|$M|N]]|$1|O|3|P|5|6|7|1O|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|1P|8|@]|9|@]|A|$]]|$1|S|3|T|5|L|7|1Q|8|@]|9|@]|A|$M|N]]|$1|U|3|V|5|6|7|1R|8|@]|9|@]|A|$]]|$1|W|3|X|5|6|7|1S|8|@$F|1T|G|1U|H|I]|$F|1V|G|1W|H|I]|$F|1X|G|1Y|H|I]|$F|1Z|G|20|H|I]]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|21|8|@$F|22|G|23|H|I]|$F|24|G|25|H|I]]|9|@]|A|$]]|$1|10|3|11|5|6|7|26|8|@$F|27|G|28|H|I]|$F|29|G|2A|H|I]|$F|2B|G|2C|H|I]]|9|@]|A|$]]|$1|12|3|13|5|6|7|2D|8|@]|9|@]|A|$]]|$1|14|3|15|5|6|7|2E|8|@]|9|@$F|2F|G|2G|1|2H]]|A|$]]|$1|16|3|-4|5|6|7|2I|8|@]|9|@]|A|$]]]|17|$18|$5|19|1A|1B|A|$1C|1D]]]]

In some previous backups, your bad objects may have been packed in different files or may be loose objects yet. So your objects may be recovered.

It seems there are a few bad objects in your database. So you could do it the manual way.

Because of <code>git hash-object</code>, <code>git mktree</code> and <code>git commit-tree</code> do not write the objects because they are found in the pack, then start doing this:

<pre><code>mv .git/objects/pack/* &lt;somewhere&gt;
for i in &lt;somewhere&gt;/*.pack; do
 git unpack-objects -r &lt; $i
done
rm &lt;somewhere&gt;/*
</code></pre>

(Your packs are moved out from the repository, and unpacked again in it; only the good objects are now in the database)

You can do:

<pre><code>git cat-file -t 6c8cae4994b5ec7891ccb1527d30634997a978ee
</code></pre>

and check the type of the object.

If the type is blob: retrieve the contents of the file from previous backups (with <code>git show</code> or <code>git cat-file</code> or <code>git unpack-file</code>; then you may <code>git hash-object -w</code> to rewrite the object in your current repository.

If the type is tree: you could use <code>git ls-tree</code> to recover the tree from previous backups; then <code>git mktree</code> to write it again in your current repository.

If the type is commit: the same with <code>git show</code>, <code>git cat-file</code> and <code>git commit-tree</code>.

Of course, I would backup your original working copy before starting this process.

Also, take a look at <a href="http://www.kernel.org/pub/software/scm/git/docs/v1.7.10.1/howto/recover-corrupted-blob-object.txt" rel="noreferrer">How to Recover Corrupted Blob Object</a>.

blocks|key|1571896|text|Banengusk让我走上了正确的道路。为了进一步参考，我想发布我为修复存储库损坏而采取的步骤。我很幸运地找到了所有需要的对象，无论是在较旧的包中还是在存储库备份中。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1571897|#+Unpack+last+non-corrupted+pack
$+mv+.git/objects/pack+.git/objects/pack.old
$+git+unpack-objects+-r+<+.git/objects/pack.old/pack-012066c998b2d171913aeb5bf0719fd4655fa7d0.pack
$+git+log
fatal:+bad+object+HEAD

$+cat+.git/HEAD+
ref:+refs/heads/master

$+ls+.git/refs/heads/

$+cat+.git/packed-refs+
#+pack-refs+with:+peeled+
aa268a069add6d71e162c4e2455c1b690079c8c1+refs/heads/master

$+git+fsck+--full+
error:+HEAD:+invalid+sha1+pointer+aa268a069add6d71e162c4e2455c1b690079c8c1
error:+refs/heads/master+does+not+point+to+a+valid+object!
missing+blob+75405ef0e6f66e48c1ff836786ff110efa33a919
missing+blob+27c4611ffbc3c32712a395910a96052a3de67c9b
dangling+tree+30473f109d87f4bcde612a2b9a204c3e322cb0dc

#+Copy+HEAD+object+from+backup+of+repository
$+cp+repobackup/.git/objects/aa/268a069add6d71e162c4e2455c1b690079c8c1+.git/objects/aa
#+Now+copy+all+missing+objects+from+backup+of+repository+and+run+"git+fsck+--full"+afterwards
#+Repeat+until+git+fsck+--full+only+reports+dangling+objects

#+Now+garbage+collect+repo
$+git+gc
warning:+reflog+of+'HEAD'+references+pruned+commits
warning:+reflog+of+'refs/heads/master'+references+pruned+commits
Counting+objects:+3992,+done.
Delta+compression+using+2+threads.
fatal:+object+bf1c4953c0ea4a045bf0975a916b53d247e7ca94+inconsistent+object+length+(6093+vs+415232)
error:+failed+to+run+repack

#+Check+reflogs...
$+git+reflog

#+...then+clean
$+git+reflog+expire+--expire=0+--all

#+Now+garbage+collect+again
$+git+gc+++++++
Counting+objects:+3992,+done.
Delta+compression+using+2+threads.
Compressing+objects:+100%25+(3970/3970),+done.
Writing+objects:+100%25+(3992/3992),+done.
Total+3992+(delta+2060),+reused+0+(delta+0)
Removing+duplicate+objects:+100%25+(256/256),+done.
#+Done!|code-block|syntax|javascript|1571898|entityMap|0|LINK|mutability|MUTABLE|url|/users/16135/banengusk/^0|0|9|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@$A|R|B|S|1|T]]|C|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|C|$G|H]]|$1|I|3|-4|5|6|7|V|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]]]

<a href="/users/16135/banengusk/">Banengusk</a> was putting me on the right track. For further reference, I want to post the steps I took to fix my repository corruption. I was lucky enough to find all needed objects either in older packs or in repository backups.

<pre class="lang-bash prettyprint-override"><code># Unpack last non-corrupted pack
$ mv .git/objects/pack .git/objects/pack.old
$ git unpack-objects -r &lt; .git/objects/pack.old/pack-012066c998b2d171913aeb5bf0719fd4655fa7d0.pack
$ git log
fatal: bad object HEAD

$ cat .git/HEAD 
ref: refs/heads/master

$ ls .git/refs/heads/

$ cat .git/packed-refs 
# pack-refs with: peeled 
aa268a069add6d71e162c4e2455c1b690079c8c1 refs/heads/master

$ git fsck --full 
error: HEAD: invalid sha1 pointer aa268a069add6d71e162c4e2455c1b690079c8c1
error: refs/heads/master does not point to a valid object!
missing blob 75405ef0e6f66e48c1ff836786ff110efa33a919
missing blob 27c4611ffbc3c32712a395910a96052a3de67c9b
dangling tree 30473f109d87f4bcde612a2b9a204c3e322cb0dc

# Copy HEAD object from backup of repository
$ cp repobackup/.git/objects/aa/268a069add6d71e162c4e2455c1b690079c8c1 .git/objects/aa
# Now copy all missing objects from backup of repository and run "git fsck --full" afterwards
# Repeat until git fsck --full only reports dangling objects

# Now garbage collect repo
$ git gc
warning: reflog of 'HEAD' references pruned commits
warning: reflog of 'refs/heads/master' references pruned commits
Counting objects: 3992, done.
Delta compression using 2 threads.
fatal: object bf1c4953c0ea4a045bf0975a916b53d247e7ca94 inconsistent object length (6093 vs 415232)
error: failed to run repack

# Check reflogs...
$ git reflog

# ...then clean
$ git reflog expire --expire=0 --all

# Now garbage collect again
$ git gc 
Counting objects: 3992, done.
Delta compression using 2 threads.
Compressing objects: 100% (3970/3970), done.
Writing objects: 100% (3992/3992), done.
Total 3992 (delta 2060), reused 0 (delta 0)
Removing duplicate objects: 100% (256/256), done.
# Done!
</code></pre>

blocks|key|1572026|text|如果您的备份已损坏，或者您也有一些部分损坏的备份(如果您备份损坏的对象，则可能会发生这种情况)，这里有两个功能可能会有所帮助。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1572027|在你想要恢复的repo中同时运行这两个。|1572028|标准警告:只有当你真的很绝望，并且你已经备份了你的(损坏的)+repo时才使用。这可能解决不了任何问题，但至少应该突出腐败的程度。|1572029|fsck_rm_corrupted()+{
++++corrupted='a'
++++while+[+"$corrupted"+];+do
++++++++corrupted=$(++++++++++++++++++++++++++++++++++\
++++++++git+fsck+--full+--no-dangling+2>&1+>/dev/null+\
++++++++++++%7C+grep+'stored+in'++++++++++++++++++++++++++\
++++++++++++%7C+sed+-r+'s:.*(\.git/.*)\).*:\1:'+++++++++++\
++++++++)
++++++++echo+"$corrupted"
++++++++rm+-f+"$corrupted"
++++done
}

if+[+-z+"$1"+]++%7C%7C+[+!+-d+"$1"+];+then
++++echo+"'$1'+is+not+a+directory.+Please+provide+the+directory+of+the+git+repo"
++++exit+1
fi

pushd+"$1"+>/dev/null
fsck_rm_corrupted
popd+>/dev/null|code-block|syntax|javascript|1572030|和|1572031|unpack_rm_corrupted()+{
++++corrupted='a'
++++while+[+"$corrupted"+];+do
++++++++corrupted=$(++++++++++++++++++++++++++++++++++\
++++++++git+unpack-objects+-r+<+"$1"+2>&1+>/dev/null+\
++++++++++++%7C+grep+'stored+in'++++++++++++++++++++++++++\
++++++++++++%7C+sed+-r+'s:.*(\.git/.*)\).*:\1:'+++++++++++\
++++++++)
++++++++echo+"$corrupted"
++++++++rm+-f+"$corrupted"
++++done
}

if+[+-z+"$1"+]++%7C%7C+[+!+-d+"$1"+];+then
++++echo+"'$1'+is+not+a+directory.+Please+provide+the+directory+of+the+git+repo"
++++exit+1
fi

for+p+in+$1/objects/pack/pack-*.pack;+do
++++echo+"$p"
++++unpack_rm_corrupted+"$p"
done|1572032|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|R|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|S|8|@]|9|@]|A|$]]|$1|F|3|G|5|H|7|T|8|@]|9|@]|A|$I|J]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|N|5|H|7|V|8|@]|9|@]|A|$I|J]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

Here are two functions that may help if your backup is corrupted, or you have a few partially corrupted backups as well (this may happen if you backup the corrupted objects).

Run both in the repo you're trying to recover.

Standard warning: only use if you're really desperate and you have backed up your (corrupted) repo. This might not resolve anything, but at least should highlight the level of corruption.

<pre class="lang-sh prettyprint-override"><code>fsck_rm_corrupted() {
 corrupted='a'
 while [ "$corrupted" ]; do
 corrupted=$( \
 git fsck --full --no-dangling 2&gt;&amp;1 &gt;/dev/null \
 | grep 'stored in' \
 | sed -r 's:.*(\.git/.*)\).*:\1:' \
 )
 echo "$corrupted"
 rm -f "$corrupted"
 done
}

if [ -z "$1" ] || [ ! -d "$1" ]; then
 echo "'$1' is not a directory. Please provide the directory of the git repo"
 exit 1
fi

pushd "$1" &gt;/dev/null
fsck_rm_corrupted
popd &gt;/dev/null
</code></pre>

and

<pre class="lang-sh prettyprint-override"><code>unpack_rm_corrupted() {
 corrupted='a'
 while [ "$corrupted" ]; do
 corrupted=$( \
 git unpack-objects -r &lt; "$1" 2&gt;&amp;1 &gt;/dev/null \
 | grep 'stored in' \
 | sed -r 's:.*(\.git/.*)\).*:\1:' \
 )
 echo "$corrupted"
 rm -f "$corrupted"
 done
}

if [ -z "$1" ] || [ ! -d "$1" ]; then
 echo "'$1' is not a directory. Please provide the directory of the git repo"
 exit 1
fi

for p in $1/objects/pack/pack-*.pack; do
 echo "$p"
 unpack_rm_corrupted "$p"
done
</code></pre>

blocks|key|1356924|text|我已经通过添加一些更改解决了这个问题，比如再次添加git+add+-A和git+commit。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1356925|entityMap^0|P|A|10|A|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|M|8|@]|D|@]|E|$]]]|G|$]]

I have resolved this problem by adding some change, like <code>git add -A</code> and <code>git commit</code> again.

I have had a hard disk failure which resulted in some files of a Git repository getting damaged. When running <code>git fsck --full</code> I get the following output:

<pre><code>error: .git/objects/pack/pack-6863e0a0e4b4ded6090fac5d12eba6ca7346b19c.pack SHA1 checksum mismatch
error: index CRC mismatch for object 6c8cae4994b5ec7891ccb1527d30634997a978ee from .git/objects/pack/pack-6863e0a0e4b4ded6090fac5d12eba6ca7346b19c.pack at offset 97824129
error: inflate: data stream error (invalid code lengths set)
error: cannot unpack 6c8cae4994b5ec7891ccb1527d30634997a978ee from .git/objects/pack/pack-6863e0a0e4b4ded6090fac5d12eba6ca7346b19c.pack at offset 97824129
error: inflate: data stream error (invalid stored block lengths)
error: failed to read object 0dcf6723cc69cc7f91d4a7432d0f1a1f05e77eaa at offset 276988017 from .git/objects/pack/pack-6863e0a0e4b4ded6090fac5d12eba6ca7346b19c.pack
fatal: object 0dcf6723cc69cc7f91d4a7432d0f1a1f05e77eaa is corrupted
</code></pre>

I have backups of the repository, but the only backup that includes the pack file has it already damaged. So I think that I have to find out a way to retrieve the single objects from different backups and somehow instruct Git to produce a new pack with only correct objects.

Can you please give me hints how to fix my repository?

How to recover Git objects damaged by hard disk failure?

我有一个硬盘故障，导致Git存储库的一些文件被损坏。运行git fsck --full时，我得到以下输出：error: .git/objects/pack/pack-6863e0a0e4b4ded6090fac5d12eba6ca7346b19c.pack SHA1 checksum mismatcherror: in...

问如何恢复硬盘损坏的Git对象？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何恢复硬盘损坏的Git对象？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何恢复硬盘损坏的Git对象？
EN