{"push_id":848301767,"size":36,"distinct_size":1,"ref":"refs/heads/jk/follow-multiple-wip","head":"00c1eb75c2376ffa01f009d3df6ab5823f7463e3","before":"c1b88198957419b014fa1caf404c9d11ceaae9cd","commits":[{"sha":"c39badbb9acfdbc26a23115943bd08311e784db1","author":{"email":"d2635f9f6be81b9042e1c1be60d20ebe0e16c7e2@gmail.com","name":"Trần Ngọc Quân"},"message":"Updated Vietnamese translation\n\nSigned-off-by: Trần Ngọc Quân <vnwildman@gmail.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/c39badbb9acfdbc26a23115943bd08311e784db1"},{"sha":"0181681e921fa4e001a51886749ee0584233db51","author":{"email":"053ce55f4869b7f450d1d77b8f162c6f2bb9e137@gmail.com","name":"Alex Riesen"},"message":"clone: allow \"--dissociate\" without reference\n\nThe \"--reference\" option is not the only way to provide a repository\nto borrow objects from.  A repository that borrows from another\nrepository can be cloned with \"clone --local\" and the resulting\nrepository will borrow from the same repository, which the user\nmay want to \"--dissociate\" from.\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/0181681e921fa4e001a51886749ee0584233db51"},{"sha":"29abb33978f713cd0a5cc3687bf61077b0928840","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"add: simplify -u/-A without pathspec\n\nSince Git 2.0, \"add -u\" and \"add -A\" run from a subdirectory without\nany pathspec mean \"everything in the working tree\" (before 2.0, they\nwere limited to the current directory).  The limiting to the current\ndirectory was implemented by inserting \".\" to the command line when\nthe end user did not give us any pathspec.  At 2.0, we updated the\ncode to insert \":/\" (instead of '.') to consider everything from the\ntop-level, by using a pathspec magic \"top\".\n\nThe call to parse_pathspec() using the command line arguments is,\nhowever, made with PATHSPEC_PREFER_FULL option since 5a76aff1 (add:\nconvert to use parse_pathspec, 2013-07-14), which predates Git 2.0.\nIn retrospect, there was no need to turn \"adding . to limit to the\ndirectory\" into \"adding :/ to unlimit to everywhere\" in Git 2.0;\ninstead we could just have done \"if there is no pathspec on the\ncommand line, just let it be\".  The parse_pathspec() then would give\nus a pathspec that matches everything and all is well.\n\nIncidentally such a simplification also fixes a corner case bug that\nstems from the fact that \":/\" does not necessarily mean any magic.\nA user would say \"git --literal-pathspecs add -u :/\" from the\ncommand line when she has a directory ':' and wants to add\neverything in it (and she knows that her :/ will be taken as\n'everything under the sun' magic pathspec unless she disables the\nmagic with --literal-pathspecs).  The internal use of ':/' would\nbehave the same way as such an explicitly given \":/\" when run with\n\"--literal-pathspecs\", and will not add everything under the sun as\nthe code originally intended.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/29abb33978f713cd0a5cc3687bf61077b0928840"},{"sha":"b2af4829cc51fc90885948f19f24b76f2670a677","author":{"email":"71b52ec50d6675b30625f9b9f305490cfa824ff0@gmail.com","name":"Xue Fuqiao"},"message":"user-manual: fix the description of fast-forward\n\nThe \"Fast-forward merges\" section of user-manual.txt incorrectly\nsays if the current branch is a descendant of the other, Git will\nperform a fast-forward merge, but it should the other way around.\n\nSigned-off-by: Xue Fuqiao <xfq.free@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/b2af4829cc51fc90885948f19f24b76f2670a677"},{"sha":"95261974bbc8cc1a32ed260f06a694cde86f732d","author":{"email":"0706025b2bbcec1ed8d64822f4eccd96314938d0@max630.net","name":"Max Kirillov"},"message":"blame: fix option name in error message\n\nThe option name used in blame's UI is `--reverse`.\n\nSigned-off-by: Max Kirillov <max@max630.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/95261974bbc8cc1a32ed260f06a694cde86f732d"},{"sha":"71d92575251bdb8b5e1b5b3a5c649bb63d9fc116","author":{"email":"53fb8db7833fca1e1746dd8592f61048d350f64c@gmx.de","name":"Johannes Schindelin"},"message":"imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available\n\nThis fixes the compilation on an older Linux that was used to debug\ntest failures when upgrading Git for Windows to Git v2.3.0.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/71d92575251bdb8b5e1b5b3a5c649bb63d9fc116"},{"sha":"8f7744235844c44e780e026868beef29693c062e","author":{"email":"53fb8db7833fca1e1746dd8592f61048d350f64c@gmx.de","name":"Johannes Schindelin"},"message":"Squelch warning about an integer overflow\n\nWe cannot rely on long integers to have more than 32 bits.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/8f7744235844c44e780e026868beef29693c062e"},{"sha":"56a1a3ab449df33268776a8b72a301d3ee67ad8d","author":{"email":"53fb8db7833fca1e1746dd8592f61048d350f64c@gmx.de","name":"Johannes Schindelin"},"message":"Silence GCC's \"cast of pointer to integer of a different size\" warning\n\nWhen calculating hashes from pointers, it actually makes sense to cut\noff the most significant bits. In that case, said warning does not make\na whole lot of sense.\n\nSo let's just work around it by casting the pointer first to intptr_t\nand then casting up/down to the final integral type.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/56a1a3ab449df33268776a8b72a301d3ee67ad8d"},{"sha":"fdcdb778551b904d57c127d9a3546f6a7c8792d3","author":{"email":"c2359ca90edb3c7061c6953998872bd067ffd0b8@gmail.com","name":"Waldek Maleska"},"message":"Correct fscanf formatting string for I64u values\n\nThis fix is probably purely cosmetic because PRIuMAX is likely identical\nto SCNuMAX. Nevertheless, when using a function of the scanf() family,\nthe correct interpolation to use is the latter, not the former.\n\nSigned-off-by: Waldek Maleska <w.maleska@gmail.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/fdcdb778551b904d57c127d9a3546f6a7c8792d3"},{"sha":"e510ab898865fdaf131e9bc9fd6ab6b7c4a94c9b","author":{"email":"2da278a99b557fc93ddbed7517a413ad793e2e6a@web.de","name":"René Scharfe"},"message":"use pop_commit() for consuming the first entry of a struct commit_list\n\nInstead of open-coding the function pop_commit() just call it.  This\nmakes the intent clearer and reduces code size.\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/e510ab898865fdaf131e9bc9fd6ab6b7c4a94c9b"},{"sha":"6f50833e98d9d88e331a0d5022130dd3d49cf876","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"t6031: move triple-rename test to t3030\n\nThe t6031 test was introduced to check filemode handling of\nmerge-recursive. Much later, an unrelated test was tacked on\nto look at renames and d/f conflicts. This test does not\ndepend on anything that happened before (it actually blows\naway any existing content in the test repo). Let's move it\nto t3030, where there are more related tests.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/6f50833e98d9d88e331a0d5022130dd3d49cf876"},{"sha":"f78d1fe208d3db36afecbd8b8a84d6c35391bd0b","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"t6031: generalize for recursive and resolve strategies\n\nThis script tests the filemode handling of merge-recursive,\nbut we do not test the same thing for merge-resolve. Let's\ngeneralize the script a little:\n\n  1. Break out the setup steps for each test into a separate\n     snippet.\n\n  2. For each test, run it twice; once with \"-s recursive\"\n     and once with \"-s resolve\". We can avoid repeating\n     ourselves by adding a function.\n\n  3. Since we have a nice abstracted function, we can make\n     our tests more thorough by testing both directions\n     (change on \"ours\" versus \"theirs\").\n\nThis improves our test coverage, and will make this the\nplace to add more tests related to merging mode changes.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/f78d1fe208d3db36afecbd8b8a84d6c35391bd0b"},{"sha":"72fac66bca302dbecbe42dfa0ddc7e42db2fe567","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"merge: detect delete/modechange conflict\n\nIf one side deletes a file and the other changes its\ncontent, we notice and report a conflict. However, if\ninstead of changing the content, we change only the mode,\nthe merge does not notice (and the mode change is silently\ndropped).\n\nThe trivial index merge notices the problem and correctly\nleaves the conflict in the index, but both merge-recursive\nand merge-one-file will silently resolve this in favor of\nthe deletion.  In many cases that is a sane resolution, but\nwe should be punting to the user whenever there is any\nquestion. So let's detect and treat this as a conflict (in\nboth strategies).\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/72fac66bca302dbecbe42dfa0ddc7e42db2fe567"},{"sha":"1db25aae5ef7c518b46a9f5b30f317e882ac505a","author":{"email":"53fb8db7833fca1e1746dd8592f61048d350f64c@gmx.de","name":"Johannes Schindelin"},"message":"t3404: \"rebase -i\" gets broken when insn sheet uses CR/LF line endings\n\nBased on a bug report by Chad Boles.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/1db25aae5ef7c518b46a9f5b30f317e882ac505a"},{"sha":"39743cf554caaed462464b55315ab5b37f5ab1b9","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"rebase-i: work around Windows CRLF line endings\n\nEditors on Windows can and do save text files with CRLF line\nendings, which is the convention on the platform.  We are seeing\nreports that the \"read\" command in a port of bash to the environment\nhowever does not strip the CRLF at the end, not adjusting for the\nsame convention on the platform.\n\nThis breaks the recently added sanity checks for the insn sheet fed\nto \"rebase -i\"; instead of an empty line (hence nothing in $command),\nthe script was getting a lone CR in there.\n\nSpecial case a lone CR and treat it the same way as an empty line to\nwork this around.\n\nThis patch (also) passes the test with Git for Windows, where the\nissue was seen first.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/39743cf554caaed462464b55315ab5b37f5ab1b9"},{"sha":"e34f80278e920e53b69016c7cecb24e4621e4564","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"merge-file: clamp exit code to maximum 127\n\nGit-merge-file is documented to return one of three exit\ncodes:\n\n  - zero means the merge was successful\n\n  - a negative number means an error occurred\n\n  - a positive number indicates the number of conflicts\n\nUnfortunately, this all gets stuffed into an 8-bit return\ncode. Which means that if you have 256 conflicts, this wraps\nto zero, and the merge appears to succeed (and commits a\nblob full of conflict-marker cruft!).\n\nThis patch clamps the return value to a maximum of 127,\nwhich we should be able to safely represent everywhere. This\nalso leaves 128-255 for other values. Shells (and some parts\nof git) will typically represent signal death as 128 plus\nthe signal number. And negative values are typically coerced\nto an 8-bit unsigned value (so \"return -1\" ends up as 255).\n\nTechnically negative returns have the same problem (e.g.,\n\"-256\" wraps back to 0), but this is not a problem in\npractice, as the only negative value we use is \"-1\".\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/e34f80278e920e53b69016c7cecb24e4621e4564"},{"sha":"28de56856a62a459cfb2276e517bac5af9147ab2","author":{"email":"492283376763148288091dc1edb13b1b4edf3d1b@drbeat.li","name":"Beat Bolli"},"message":"gitk: Add missing accelerators\n\nIn d99b4b0de27a (\"gitk: Accelerators for the main menu\", 2015-09-09),\naccelerators were added to allow efficient keyboard navigation. One\ninstance of the strings \"Edit view...\" and \"Delete view\" were left\nwithout the ampersand.\n\nAdd the missing ampersand characters to unbreak our international\nusers.\n\nSigned-off-by: Beat Bolli <dev+git@drbeat.li>\nSigned-off-by: Paul Mackerras <paulus@samba.org>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/28de56856a62a459cfb2276e517bac5af9147ab2"},{"sha":"a822fdbe8e926b8b3a6fd5a3eadf4150b768b44a","author":{"email":"139449a27381270391752f9e0993fccac55fea0e@gmail.com","name":"Alex Henrie"},"message":"gitk: l10n: Update Catalan translation\n\nThe gitk included in git 2.6.0 crashes if run from a Catalan locale.\nI'm hoping that a translation update will fix this.\n\nSigned-off-by: Alex Henrie <alexhenrie24@gmail.com>\nSigned-off-by: Paul Mackerras <paulus@samba.org>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/a822fdbe8e926b8b3a6fd5a3eadf4150b768b44a"},{"sha":"4ed950841e36b72fc9054a949461721d136f4b3b","author":{"email":"4596b3305151c7ee743192a95d394341e3d3b644@suse.de","name":"Takashi Iwai"},"message":"gitk: Update msgid's for menu items with accelerator\n\nThe commit d99b4b0de27a (\"gitk: Accelerators for the main menu\")\nmodified the menu item strings with the accelerator, but the\ntranslations didn't follow, thus the menus are shown without\ntranslations.\n\nThis patch systematically update the msgid keys just to follow this\nchange.  The contents aren't changed, so the accelerator won't work in\nthese locales for now.  Each locale translator needs to add proper\nacceleration keys appropriately.\n\nSigned-off-by: Takashi Iwai <tiwai@suse.de>\nSigned-off-by: Paul Mackerras <paulus@samba.org>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/4ed950841e36b72fc9054a949461721d136f4b3b"},{"sha":"c3f695d5f73cbb3b65608a9764a833525fd645e6","author":{"email":"4596b3305151c7ee743192a95d394341e3d3b644@suse.de","name":"Takashi Iwai"},"message":"gitk: Add accelerators to Japanese locale\n\nJust follow the English accelerator keys.\n\nSigned-off-by: Takashi Iwai <tiwai@suse.de>\nSigned-off-by: Paul Mackerras <paulus@samba.org>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/c3f695d5f73cbb3b65608a9764a833525fd645e6"}]}