Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.1.4 2014-11-11T18:20:13Z 2014-11-11T18:20:13Z Junio C Hamano gitster@pobox.com 2014-11-11T18:20:13Z urn:sha1:caea1a2bb52262c64fdef545578ee7c5ceb113c5 * rs/clean-menu-item-defn: clean: use f(void) instead of f() to declare a pointer to a function without arguments 2014-10-29T17:35:17Z Junio C Hamano gitster@pobox.com 2014-10-29T17:35:17Z urn:sha1:ebc2e5a593ce7082bed03b2d22e2fe83583a9f5d * jk/pack-objects-no-bitmap-when-splitting: pack-objects: turn off bitmaps when we split packs 2014-10-19T22:08:38Z Jeff King peff@peff.net 2014-10-17T01:11:43Z urn:sha1:21134714787a02a37da15424d72c0119b2b8ed71 If a pack.packSizeLimit is set, we may split the pack data across multiple packfiles. This means we cannot generate .bitmap files, as they require that all of the reachable objects are in the same pack. We check that condition when we are generating the list of objects to pack (and disable bitmaps if we are not packing everything), but we forgot to update it when we notice that we needed to split (which doesn't happen until the actual write phase). The resulting bitmaps are quite bogus (they mention entries that do not exist in the pack!) and can cause a fetch or push to send insufficient objects. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-10-07T20:39:27Z Junio C Hamano gitster@pobox.com 2014-10-07T20:39:24Z urn:sha1:b6e8269e9ba131b6ea6a10088be139dc89704fb6 Some MUAs mangled a line in a message that begins with "From " to ">From " when writing to a mailbox file and feeding such an input to "git am" used to lose such a line. * jk/mbox-from-line: mailinfo: work around -Wstring-plus-int warning mailinfo: make ">From" in-body header check more robust 2014-09-30T05:10:55Z Junio C Hamano gitster@pobox.com 2014-09-30T05:10:55Z urn:sha1:46c8f859b7eebe962d99c8547b0c908bbf8ecf0f "git fsck" failed to report that it found corrupt objects via its exit status in some cases. * jk/fsck-exit-code-fix: fsck: return non-zero status on missing ref tips fsck: exit with non-zero status upon error from fsck_obj() 2014-09-30T05:10:25Z Junio C Hamano gitster@pobox.com 2014-09-30T05:10:25Z urn:sha1:102edda4dfa3f2119119c2b52c90a9337a03178f "git config --add section.var val" used to lose existing section.var whose value was an empty string. * ta/config-add-to-empty-or-true-fix: config: avoid a funny sentinel value "a^" make config --add behave correctly for empty and NULL values 2014-09-30T05:09:24Z Junio C Hamano gitster@pobox.com 2014-09-30T05:09:24Z urn:sha1:46092ebf224d45464ef5663544b19b38b95a51c9 When receiving an invalid pack stream that records the same object twice, multiple threads got confused due to a race. * jk/index-pack-threading-races: index-pack: fix race condition with duplicate bases 2014-09-30T05:08:17Z Junio C Hamano gitster@pobox.com 2014-09-30T05:08:17Z urn:sha1:060517093ecfdf39e89edc79678ce1ba9ff52ec5 "git push" over HTTP transport had an artificial limit on number of refs that can be pushed imposed by the command line length. * jk/send-pack-many-refspecs: send-pack: take refspecs over stdin 2014-09-22T20:46:43Z Eric Sunshine sunshine@sunshineco.com 2014-09-21T09:13:58Z urn:sha1:85de86a16bd853708658eb13689d913bc377ae3e The just-released Apple Xcode 6.0.1 has -Wstring-plus-int enabled by default which complains about pointer arithmetic applied to a string literal: builtin/mailinfo.c:303:24: warning: adding 'long' to a string does not append to the string return !memcmp(SAMPLE + (cp - line), cp, strlen(SAMPLE) ... ~~~~~~~^~~~~~~~~~~~~ Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-09-19T21:05:12Z Junio C Hamano gitster@pobox.com 2014-09-19T21:05:12Z urn:sha1:08fd8a055cd11291020bf8c6f83d27cdc55df419 * nd/fetch-pass-quiet-to-gc-child-process: fetch: silence git-gc if --quiet is given fetch: convert argv_gc_auto to struct argv_array