]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ff700e ab791dd)
Merge branch 'jk/index-pack-threading-races'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:33 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:34 +0000 (11:38 -0700)
commitbd656f6e7bea734896be25d281e983ab9e1f5384
treea681d7eeed829d1c325049ced17567c9f025b090tree | snapshot
parent9ff700ebacffc8fb8cf80daabfb6503cb24dca0bcommit | diff
parentab791dd1383536405b8c68ffcf84246b3b0a9812commit | diff
Merge branch 'jk/index-pack-threading-races'

When receiving an invalid pack stream that records the same object
twice, multiple threads got confused due to a race.  We should
reject or correct such a stream upon receiving, but that will be a
larger change.

* jk/index-pack-threading-races:
  index-pack: fix race condition with duplicate bases
builtin/index-pack.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.