GitHub PushEvent at 2014-03-29 19:21:53
Repository: git
Actor: PKRoma
Payload: {"shas":[["3219bad94422084184987c9660361f3245d69f04","fe4923bbe979e2b421753ebf5fe51389205a1515@gmail.com","merge hook tests: fix missing '&&' in test\n\nSigned-off-by: Benoit Pierre <benoit.pierre@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Benoit Pierre",false],["b7ae14148fc44223b4ffaff5ccbf3227a0af8f3c","fe4923bbe979e2b421753ebf5fe51389205a1515@gmail.com","merge hook tests: use 'test_must_fail' instead of '!'\n\nSigned-off-by: Benoit Pierre <benoit.pierre@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Benoit Pierre",false],["de42180f6a645491c7ca8683ff2d5060f85f0c51","7f7e1535bcd10fa942d56a3436533af20f33203f@gmail.com","fsck.c:fsck_ident(): ident points at a const string\n\nSince fsck_ident doesn't change the content of **ident, the type of\nident could be const char **.\n\nThis change is required to rewrite fsck_commit() to use skip_prefix().\n\nSigned-off-by: Yuxuan Shui <yshuiv7@gmail.com>\nHelped-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Yuxuan Shui",false],["657673f125008da1ef92d2054c9536722c42f73b","696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","pack-objects: show progress for reused packfiles\n\nWhen the \"--all-progress\" option is in effect, pack-objects\nshows a progress report for the \"writing\" phase. If the\nrepository has bitmaps and we are reusing a packfile, the\nuser sees no progress update until the whole packfile is\nsent.  Since this is typically the bulk of what is being\nwritten, it can look like git hangs during this phase, even\nthough the transfer is proceeding.\n\nThis generally only happens with \"git push\" from a\nrepository with bitmaps. We do not use \"--all-progress\" for\nfetch (since the result is going to index-pack on the\nclient, which takes care of progress reporting). And for\nregular repacks to disk, we do not reuse packfiles.\n\nWe already have the progress meter setup during\nwrite_reused_pack; we just need to call display_progress\nwhiel we are writing out the pack. The progress meter is\nattached to our output descriptor, so it automatically\nhandles the throughput measurements.\n\nHowever, we need to update the object count as we go, since\nthat is what feeds the percentage we show. We aren't\nactually parsing the packfile as we send it, so we have no\nidea how many objects we have sent; we only know that at the\nend of N bytes, we will have sent M objects. So we cheat a\nlittle and assume each object is M/N bytes (i.e., the mean\nof the objects we are sending). While this isn't strictly\ntrue, it actually produces a more pleasing progress meter\nfor the user, as it moves smoothly and predictably (and\nnobody really cares about the object count; they care about\nthe percentage, and the object count is a proxy for that).\n\nOne alternative would be to actually show two progress\nmeters: one for the reused pack, and one for the rest of the\nobjects. That would more closely reflect the data we have\n(the first would be measured in bytes, and the second\nmeasured in objects). But it would also be more complex and\nannoying to the user; rather than seeing one progress meter\ncounting up to 100%, they would finish one meter, then start\nanother one at zero.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jeff King",false],["78d2214eb4d10ea1e30dd7e69a4e6d73d9f66164","696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","pack-objects: show reused packfile objects in \"Counting objects\"\n\nWhen we are sending a pack for push or fetch, we may reuse a\nchunk of packfile without even parsing it. The progress\nmeter then looks like this:\n\n  Reusing existing pack: 3440489, done.\n  Counting objects: 3, done.\n\nThe first line shows that we are reusing a large chunk of\nobjects, and then we further count any objects not included\nin the reused portion with an actual traversal.\n\nThese are all implementation details that the user does not\nneed to care about. Instead, we can show the reused objects\nin the normal \"counting...\" progress meter (which will\nsimply go much faster than normal), and then continue to add\nto it as we traverse.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jeff King",false],["373c67da1df7fcd33593ca26e6d67f177152b21a","696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","pack-objects: turn off bitmaps when skipping objects\n\nThe pack bitmap format requires that we have a single bit\nfor each object in the pack, and that each object's bitmap\nrepresents its complete set of reachable objects. Therefore\nwe have no way to represent the bitmap of an object which\nreferences objects outside the pack.\n\nWe notice this problem while generating the bitmaps, as we\ntry to find the offset of a particular object and realize\nthat we do not have it. In this case we die, and neither the\nbitmap nor the pack is generated. This is correct, but\nperhaps a little unfriendly. If you have bitmaps turned on\nin the config, many repacks will fail which would otherwise\nsucceed. E.g., incremental repacks, repacks with \"-l\" when\nyou have alternates, \".keep\" files.\n\nInstead, this patch notices early that we are omitting some\nobjects from the pack and turns off bitmaps (with a\nwarning). Note that this is not strictly correct, as it's\npossible that the object being omitted is not reachable from\nany other object in the pack. In practice, this is almost\nnever the case, and there are two advantages to doing it\nthis way:\n\n  1. The code is much simpler, as we do not have to cleanly\n     abort the bitmap-generation process midway through.\n\n  2. We do not waste time partially generating bitmaps only\n     to find out that some object deep in the history is not\n     being packed.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jeff King",false],["cba5e28426a5c9728d883171e4e5e287ab17136a","696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","subtree: initialize \"prefix\" variable\n\nWe parse the \"--prefix\" command-line option into the\n\"$prefix\" shell variable. However, if we do not see such an\noption, the variable is left with whatever value it had in\nthe environment. We should initialize it to a known value,\nlike we do for other variables.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jeff King",false],["91c9c8692056c0553c6ea9239ccd46f7f3dbd877","fe4923bbe979e2b421753ebf5fe51389205a1515@gmail.com","test patch hunk editing with \"commit -p -m\"\n\nAdd (failing) tests: with commit changing the environment to let hooks\nknow that no editor will be used (by setting GIT_EDITOR to \":\"), the\n\"edit hunk\" functionality does not work (no editor is launched and the\nwhole hunk is committed).\n\nSigned-off-by: Benoit Pierre <benoit.pierre@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Benoit Pierre",false],["15048f8a9ace23df67161746ca76b4f46114deee","fe4923bbe979e2b421753ebf5fe51389205a1515@gmail.com","commit: fix patch hunk editing with \"commit -p -m\"\n\nDon't change git environment: move the GIT_EDITOR=\":\" override to the\nhook command subprocess, like it's already done for GIT_INDEX_FILE.\n\nSigned-off-by: Benoit Pierre <benoit.pierre@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Benoit Pierre",false],["0a3beb0e2e29ca7a3c33a10112424650706edb5f","fe4923bbe979e2b421753ebf5fe51389205a1515@gmail.com","merge: fix GIT_EDITOR override for commit hook\n\nDon't set GIT_EDITOR to \":\" when calling prepare-commit-msg hook if the\neditor is going to be called (e.g. with \"merge -e\").\n\nSigned-off-by: Benoit Pierre <benoit.pierre@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Benoit Pierre",false],["1fc4f97d570c97471202ff561c7e3697e2faee6a","fe4923bbe979e2b421753ebf5fe51389205a1515@gmail.com","merge hook tests: fix and update tests\n\n- update 'no editor' hook test and add 'editor' hook test\n- make sure the tree is reset to a clean state after running a test\n  (using test_when_finished) so later tests are not impacted\n\nSigned-off-by: Benoit Pierre <benoit.pierre@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Benoit Pierre",false],["b549be0da7ff9075c0b3de14c1d5d03583ca8d2d","fe4923bbe979e2b421753ebf5fe51389205a1515@gmail.com","run-command: mark run_hook_with_custom_index as deprecated\n\nSigned-off-by: Benoit Pierre <benoit.pierre@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Benoit Pierre",false],["c45a18e88f47fc9b23f8e8e7b14a030434917a66","82296eb15e8045a1d569dd3417ad2c54f4c3eb07@gmail.com","add: use struct argv_array in run_add_interactive()\n\nrun_add_interactive() in builtin/add.c manually computes array bounds\nand allocates a static args array to build the add--interactive command\nline, which is error-prone. Use the argv-array helper functions instead.\n\nSigned-off-by: Fabian Ruch <bafain@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Fabian Ruch",false],["4f4074077fb0c3a2facc61b333337d024aeeebbf","6667b8c77ec6ba15b2e807ad7a2130b19e9fa935@gmail.com","rebase: allow \"-\" short-hand for the previous branch\n\nTeach rebase the same shorthand as checkout and merge to name the\nbranch to rebase the current branch on; that is, that \"-\" means \"the\nbranch we were previously on\".\n\nRequested-by: Tim Chase <git@tim.thechases.com>\nSigned-off-by: Brian Gesiak <modocache@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Brian Gesiak",false],["2d820a61dfd50d50cafab47f75a507f3e6657e9b","7f7e1535bcd10fa942d56a3436533af20f33203f@gmail.com","fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant\n\nfsck_commit() uses memcmp() to check if the buffer starts with a\ncertain prefix, and skips the prefix if it does.\n\nThis is exactly what skip_prefix() was designed for.\n\nSigned-off-by: Yuxuan Shui <yshuiv7@gmail.com>\nHelped-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Yuxuan Shui",false],["36dc827bc9d17f80ed4f326de21247a5d1341fbc","59add378c9da1b2e704a0efa0d899d65927a8c7e@gmail.com","Documentation/gitk: document the location of the configulation file\n\nUser config file location complies with the XDG base directory\nspecification while supporting the traditional $HOME/.gitk as a\nfallback.\n\nSigned-off-by: Astril Hayato <astrilhayato@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Astril Hayato",false],["e2450e1245cdbcb709e841069039077ab0a2a96a","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/pack-bitmap'\n\nInstead of dying when asked to (re)pack with the reachability\nbitmap when a bitmap cannot be built, just (re)pack without\nproducing a bitmap in such a case, with a warning.\n\n* jk/pack-bitmap:\n  pack-objects: turn off bitmaps when skipping objects","Junio C Hamano",true],["0ddcc9cfbadfca928334bbd008ad2365e1543f45","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/pack-bitmap-progress'\n\nThe progress output while repacking and transferring objects showed\nan apparent large silence while writing the objects out of existing\npackfiles, when the reachability bitmap was in use.\n\n* jk/pack-bitmap-progress:\n  pack-objects: show reused packfile objects in \"Counting objects\"\n  pack-objects: show progress for reused packfiles","Junio C Hamano",true],["fe2a4f1591db57473b296a004a7b1c74449aa53b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/subtree-prefix'\n\nA stray environment variable $prefix could have leaked into and\naffected the behaviour of the \"subtree\" script.\n\n* jk/subtree-prefix:\n  subtree: initialize \"prefix\" variable","Junio C Hamano",true],["c301a23ff8701ae2a50c62c00c400f87e6585511","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'fr/add-interactive-argv-array'\n\n* fr/add-interactive-argv-array:\n  add: use struct argv_array in run_add_interactive()","Junio C Hamano",true]],"size":25,"ref":"refs/heads/master","head":"96e67c86f817b4fbd492b12f57dae4bd821571ba"}