{"push_id":609937513,"size":1000,"distinct_size":171,"ref":"refs/heads/next","head":"d87118a61e74087359ac4d43ef91e5be61958443","before":"a18298763ed902b1612693a96068db9545ac94cf","commits":[{"sha":"f6f61cbbad0611e03b712cc354f1665b5d7b087e","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Sync with maint\n\n* maint:","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/f6f61cbbad0611e03b712cc354f1665b5d7b087e"},{"sha":"022cf2bf88e63c8f19935d0b66abf20e6dde1c8a","author":{"email":"b96f12d19241f1371541468c8d1241e042cc5b4c@arcor.de","name":"Thomas Ackermann"},"message":"gittutorial.txt: remove reference to ancient Git version\n\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/022cf2bf88e63c8f19935d0b66abf20e6dde1c8a"},{"sha":"2672671872adf28be744b789f9acd6b2a50d5ed1","author":{"email":"0706025b2bbcec1ed8d64822f4eccd96314938d0@quendi.de","name":"Max Horn"},"message":"doc: add some crossrefs between manual pages\n\nIn particular, git-fast-import and -export link to each\nother, and gitremote-helpers links to existing remote\nhelpers, and vice versa. Also link to fast-import from the\nremote helper spec, as this is relevant for remote helpers\nusing the fast-import format.\n\nSigned-off-by: Max Horn <max@quendi.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/2672671872adf28be744b789f9acd6b2a50d5ed1"},{"sha":"b0de56c6a5bb41da71babafefc9207b0fc211d66","author":{"email":"759412786bc533369b22377bf83fb9056c5b25b2@herland.net","name":"Johan Herland"},"message":"builtin/notes: simplify early exit code in add()\n\nRemove the need for 'retval' and the unnecessary goto. Also reorganize\nto only call free_note_data() is actually needed.\n\nImproved-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/b0de56c6a5bb41da71babafefc9207b0fc211d66"},{"sha":"52694cdabbf68f19c8289416e7bb3bbef41d8d27","author":{"email":"759412786bc533369b22377bf83fb9056c5b25b2@herland.net","name":"Johan Herland"},"message":"builtin/notes: split create_note() to clarify add vs. remove logic\n\ncreate_note() has a non-trivial interface, and comprises three loosely\nrelated parts:\n\n 1. launching the editor with the note contents, if needed\n 2. appending to an existing note, if append_only was given\n 3. adding or removing the resulting note, based on whether it's non-empty\n\nSplit it along those lines to make the logic clearer: The first part\ngoes into a new function - prepare_note_data(), with a simpler interface.\nThe second part is moved into append_edit(), which is the only user of\nthis code. Finally, the add vs. remove decision is moved into the callers\n(add() and append_edit()), keeping the logic for writing the actual note\nobject in a separate function: write_note_data().\n\nSuggested-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/52694cdabbf68f19c8289416e7bb3bbef41d8d27"},{"sha":"d73a5b933db1e722faa54d6709e89e2450d7c1e3","author":{"email":"759412786bc533369b22377bf83fb9056c5b25b2@herland.net","name":"Johan Herland"},"message":"builtin/notes: add --allow-empty, to allow storing empty notes\n\nAlthough the \"git notes\" man page advertises that we support binary-safe\nnotes addition (using the -C option), we currently do not support adding\nthe empty note (i.e. using the empty blob to annotate an object). Instead,\nan empty note is always treated as an intent to remove the note\naltogether.\n\nIntroduce the --allow-empty option to the add/append/edit subcommands,\nto explicitly allow an empty note to be stored into the notes tree.\n\nAlso update the documentation, and add test cases for the new option.\n\nReported-by: James H. Fisher <jhf@trifork.com>\nImproved-by: Kyle J. McKay <mackyle@gmail.com>\nImproved-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/d73a5b933db1e722faa54d6709e89e2450d7c1e3"},{"sha":"8a4acd699536c518c9245714d6175aa39d13eb9d","author":{"email":"759412786bc533369b22377bf83fb9056c5b25b2@herland.net","name":"Johan Herland"},"message":"notes: empty notes should be shown by 'git log'\n\nIf the user has gone through the trouble of explicitly adding an empty\nnote, then \"git log\" should not silently skip it (as if it didn't exist).\n\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/8a4acd699536c518c9245714d6175aa39d13eb9d"},{"sha":"bbebdc1dcaf4a004391c7148ac1ce32b2d4633ee","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/fetch-reflog-df-conflict'\n\nFix-up a test for portability.\n\n* jk/fetch-reflog-df-conflict:\n  t1410: fix breakage on case-insensitive filesystems","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/bbebdc1dcaf4a004391c7148ac1ce32b2d4633ee"},{"sha":"7fa1365c54c28b3cd9375539f381b54061a1880d","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/gitignore-trailing-whitespace' into maint\n\n* nd/gitignore-trailing-whitespace:\n  gitignore.txt: fix spelling of \"backslash\"","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/7fa1365c54c28b3cd9375539f381b54061a1880d"},{"sha":"9c70e2c105f9c4b4708af6ae25d2678929b3d61d","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Sync with 'maint'","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/9c70e2c105f9c4b4708af6ae25d2678929b3d61d"},{"sha":"f5709437d963e585df0691989d3ccfee1de1572b","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Update draft release notes to 2.2\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/f5709437d963e585df0691989d3ccfee1de1572b"},{"sha":"faa8fac1ec03a5ac2b69ee686651a92d65d542c0","author":{"email":"43c3644fbb19a52dd978818b473d19c5e7fe210f@inventati.org","name":"Slavomir Vlcek"},"message":"SubmittingPatches: final submission is To: maintainer and CC: list\n\nIn an earlier part there is:\n\n  \"re-send it with \"To:\" set to the maintainer [*1*] and \"cc:\" the list [*2*]\"\n\nfor the final submission, but later we see\n\n  \"Send it to the list and cc the maintainer.\"\n\nFix the later one to match the previous.\n\nSigned-off-by: Slavomir Vlcek <svlc@inventati.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/faa8fac1ec03a5ac2b69ee686651a92d65d542c0"},{"sha":"c4f901d1593f3ef097c3e73daa2847ed9ad9efe0","author":{"email":"43c3644fbb19a52dd978818b473d19c5e7fe210f@inventati.org","name":"Slavomir Vlcek"},"message":"builtin: move builtin retrieval to get_builtin()\n\nThere was a redundant code for a builtin command retrieval in\n'handle_builtin()' and 'is_builtin()'.\n\nIntroduce a new function 'get_builtin()' and using it from\nboth of these places to reduce the redundancy.\n\nSigned-off-by: Slavomir Vlcek <svlc@inventati.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/c4f901d1593f3ef097c3e73daa2847ed9ad9efe0"},{"sha":"f904f6603a0c34645dbb307408e0e4033b5e1113","author":{"email":"955341c97b9d93a23c19524fc0105a6405902afe@web.de","name":"Torsten Bögershausen"},"message":"t5705: the file:// URL should be absolute\n\nThe test misused a URL \"file://.\" to mean \"relative to here\",\nwhich we no longer accept.\n\nIn a file:// URL, typically there is no host, and RFC1738 says that\nfile:///<path> should be used.\n\nUpdate t5705 to use a working URL.\n\nReported-by: Michael Blume <blume.mike@gmail.com>\nSigned-off-by: Torsten Bögershausen <tboegi@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/f904f6603a0c34645dbb307408e0e4033b5e1113"},{"sha":"8942821ec046238b6cea12e6dd4dfa7ba51c133e","author":{"email":"90f89c2062aca940dadf79728a878f6465615f33@gmail.com","name":"Stefan Naewe"},"message":"gittutorial: fix output of 'git status'\n\n'git status' doesn't output leading '#'s these days.\n\nSigned-off-by: Stefan Naewe <stefan.naewe@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/8942821ec046238b6cea12e6dd4dfa7ba51c133e"},{"sha":"073281e2aea7177e27de8a46c5463e2f83833412","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"pass TIME_DATE_NOW to approxidate future-check\n\nThe approxidate functions accept an extra \"now\" parameter to\navoid calling time() themselves. We use this in our test\nsuite to make sure we have a consistent time for computing\nrelative dates. However, deep in the bowels of approxidate,\nwe also call time() to check whether possible dates are far\nin the future. Let's make sure that the \"now\" override makes\nit to that spot, too, so we can consistently test that\nfeature.\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/ilya-bobyr/git/commits/073281e2aea7177e27de8a46c5463e2f83833412"},{"sha":"c5326bd62b7e168ba1339dacb7ee812d0fe98c7c","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"checkout $tree: do not throw away unchanged index entries\n\nWhen we \"git checkout $tree\", we pull paths from $tree into\nthe index, and then check the resulting entries out to the\nworktree. Our method for the first step is rather\nheavy-handed, though; it clobbers the entire existing index\nentry, even if the content is the same. This means we lose\nour stat information, leading checkout_entry to later\nrewrite the entire file with identical content.\n\nInstead, let's see if we have the identical entry already in\nthe index, in which case we leave it in place. That lets\ncheckout_entry do the right thing. Our tests cover two\ninteresting cases:\n\n  1. We make sure that a file which has no changes is not\n     rewritten.\n\n  2. We make sure that we do update a file that is unchanged\n     in the index (versus $tree), but has working tree\n     changes. We keep the old index entry, and\n     checkout_entry is able to realize that our stat\n     information is out of date.\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/ilya-bobyr/git/commits/c5326bd62b7e168ba1339dacb7ee812d0fe98c7c"},{"sha":"d37239536ce960af9292fdf297e7c277303e95be","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"approxidate: allow ISO-like dates far in the future\n\nWhen we are parsing approxidate strings and we find three\nnumbers separate by one of \":/-.\", we guess that it may be a\ndate. We feed the numbers to match_multi_number, which\nchecks whether it makes sense as a date in various orderings\n(e.g., dd/mm/yy or mm/dd/yy, etc).\n\nOne of the checks we do is to see whether it is a date more\nthan 10 days in the future. This was added in 38035cf (date\nparsing: be friendlier to our European friends.,\n2006-04-05), and lets us guess that if it is currently April\n2014, then \"10/03/2014\" is probably March 10th, not October\n3rd.\n\nThis has a downside, though; if you want to be overly\ngenerous with your \"--until\" date specification, we may\nwrongly parse \"2014-12-01\" as \"2014-01-12\" (because the\nlatter is an in-the-past date). If the year is a future year\n(i.e., both are future dates), it gets even weirder. Due to\nthe vagaries of approxidate, months _after_ the current date\n(no matter the year) get flipped, but ones before do not.\n\nThis patch drops the \"in the future\" check for dates of this\nform, letting us treat them always as yyyy-mm-dd, even if\nthey are in the future. This does not affect the normal\ndd/mm/yyyy versus mm/dd/yyyy lookup, because this code path\nonly kicks in when the first number is greater than 70\n(i.e., it must be a year, and cannot be either a date or a\nmonth).\n\nThe one possible casualty is that \"yyyy-dd-mm\" is less\nlikely to be chosen over \"yyyy-mm-dd\". That's probably OK,\nthough because:\n\n  1. The difference happens only when the date is in the\n     future. Already we prefer yyyy-mm-dd for dates in the\n     past.\n\n  2. It's unclear whether anybody even uses yyyy-dd-mm\n     regularly. It does not appear in lists of common date\n     formats in Wikipedia[1,2].\n\n  3. Even if (2) is wrong, it is better to prefer ISO-like\n     dates, as that is consistent with what we use elsewhere\n     in git.\n\n[1] http://en.wikipedia.org/wiki/Date_and_time_representation_by_country\n[2] http://en.wikipedia.org/wiki/Calendar_date\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/ilya-bobyr/git/commits/d37239536ce960af9292fdf297e7c277303e95be"},{"sha":"c616d845b5c12f46f9a44d3aeb835004ad2aba5f","author":{"email":"d790fea1760bfa57e221e3da971e544c5c4e0598@gmail.com","name":"Ralf Thielow"},"message":"l10n: de.po: use imperative form for command options\n\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/c616d845b5c12f46f9a44d3aeb835004ad2aba5f"},{"sha":"49e0c5ad0ab95e450138105ff27688861a4a1557","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Git 2.2.0-rc2\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/ilya-bobyr/git/commits/49e0c5ad0ab95e450138105ff27688861a4a1557"}]}