{"push_id":544790637,"size":101,"distinct_size":101,"ref":"refs/heads/master","head":"beb691f77028ae2e93653fdfccebd0a070042b43","before":"47103bd6b3e64965c6a405b6c23a3c9bee40885f","commits":[{"sha":"05e73682cd28eeaf6d949badefd85b94244fca3f","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"checkout: report upstream correctly even with loosely defined branch.*.merge\n\nWhen checking out a branch that is set to build on top of another\nbranch (often, a remote-tracking branch), \"git checkout\" reports how\nyour work relates to the other branch, e.g.\n\n    Your branch is behind 'origin/master', and can be fast-forwarded.\n\nBack when this feature was introduced, this was only done for\nbranches that build on remote-tracking branches, but 5e6e2b48 (Make\nlocal branches behave like remote branches when --tracked,\n2009-04-01) added support to give the same report for branches that\nbuild on other local branches (i.e. branches whose branch.*.remote\nvariables are set to '.').  Unlike the support for the branches\nbuilding on remote-tracking branches, however, this did not take\ninto account the fact that branch.*.merge configuration is allowed\nto record a shortened branch name.\n\nWhen branch.*.merge is set to 'master' (not 'refs/heads/master'),\ni.e. \"my branch builds on the local 'master' branch\", this caused\n\"git checkout\" to report:\n\n    Your branch is based on 'master', but the upstream is gone.\n\nThe upstream is our repository and is definitely not gone, so this\noutput is nonsense.\n\nThe fix is fairly obvious; just like the branch name is DWIMed when\n\"git pull\" merges from the 'master' branch without complaint on such\na branch, the name of the branch the current branch builds upon\nneeds to be DWIMed the same way.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/05e73682cd28eeaf6d949badefd85b94244fca3f"},{"sha":"fb1d6dabce69bce3f28a7f442da990ef8df872ac","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"clone: --dissociate option to mark that reference is only temporary\n\nWhile use of the --reference option to borrow objects from an\nexisting local repository of the same project is an effective way to\nreduce traffic when cloning a project over the network, it makes the\nresulting \"borrowing\" repository dependent on the \"borrowed\"\nrepository.  After running\n\n\tgit clone --reference=P $URL Q\n\nthe resulting repository Q will be broken if the borrowed repository\nP disappears.\n\nThe way to allow the borrowed repository to be removed is to repack\nthe borrowing repository (i.e. run \"git repack -a -d\" in Q); while\npower users may know it very well, it is not easily discoverable.\n\nTeach a new \"--dissociate\" option to \"git clone\" to run this\nrepacking for the user.\n\nHelped-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/fb1d6dabce69bce3f28a7f442da990ef8df872ac"},{"sha":"6936b5859c47b826437218fbfc0e2bc0935f7136","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"diff -B -M: fix output for \"copy and then rewrite\" case\n\nStarting from a single file, A, if you create B as a copy of A (and\npossibly make some edit) and then make extensive change to A, you\nwill see:\n\n    $ git diff -C --name-status\n    C89    A    B\n    M      A\n\nwhich is expected.  However, if you ask the same question in a\ndifferent way, you see this:\n\n    $ git diff -B -M --name-status\n    R89    A    B\n    M100   A\n\ntelling us that A was rename-edited into B (as if \"A will no longer\nexist as the result\") and at the same time A itself was extensively\nedited.\n\nIn this case, because the resulting tree still does have file A\n(even if it has contents vastly different from the original), we\nshould use \"C\"opy, not \"R\"ename, to avoid hinting that A somehow\ngoes away.\n\nTwo existing tests were depending on the wrong behaviour, and fixed.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/6936b5859c47b826437218fbfc0e2bc0935f7136"},{"sha":"d55aeb7687448189327ad058096b55431da5ea42","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines\n\nThe strbuf_add_commented_lines() function passes a pair of prefixes,\none to be used for a non-empty line, and the other for an empty\nline, to underlying add_lines().  The former is set to a comment\nchar followed by a SP, while the latter is set to just the comment\nchar.  This is designed to give a SP after the comment character,\ne.g. \"# <user text>\\n\", on a line with some text, and to avoid\nemitting an unsightly \"# \\n\" for an empty line.\n\nTeach this machinery to also use the latter space-less prefix when\nthe payload line begins with a tab, to show e.g. \"#\\t<user text>\\n\";\notherwise we will end up showing \"# \\t<user text>\\n\" which is\nsimilarly unsightly.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/d55aeb7687448189327ad058096b55431da5ea42"},{"sha":"d76c9e95b435b660f8f1b3e01d3c2f934e2ec441","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"bisect: clean flags after checking merge bases\n\nUnless there is a good reason to belieave that a particular\ninvocation of a get_merge_bases*() is the last one that cares about\nthe object flags the computation of merge bases leaves on the\nobjects, the \"cleanup\" parameter should always be true, and I do not\nthink there is one in this codepath.\n\nFound by code inspection.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/d76c9e95b435b660f8f1b3e01d3c2f934e2ec441"},{"sha":"2ce406ccb85c4546b6d19309a6101b37c7bd952e","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"get_merge_bases(): always clean-up object flags\n\nThe callers of get_merge_bases() can choose to leave object flags\nused during the merge-base traversal by passing cleanup=0 as a\nparameter, but in practice a very few callers can afford to do so\n(namely, \"git merge-base\"), as they need to compute merge base in\npreparation for other processing of their own and they need to see\nthe object without contaminate flags.\n\nChange the function signature of get_merge_bases_many() and\nget_merge_bases() to drop the cleanup parameter, so that the\nmajority of the callers do not have to say \", 1\" at the end.\n\nGive a new get_merge_bases_many_dirty() API to support only a few\ncallers that know they do not need to spend cycles cleaning up the\nobject flags.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/2ce406ccb85c4546b6d19309a6101b37c7bd952e"},{"sha":"fa137f67a40bbcb3f583920586fdd34ce98ddeaf","author":{"email":"024f400cd820cb2ddbe54c7fecfd01e45f30bb96@gmail.com","name":"Nguyễn Thái Ngọc Duy"},"message":"lockfile.c: store absolute path\n\nLocked paths can be saved in a linked list so that if something wrong\nhappens, *.lock are removed. For relative paths, this works fine if we\nkeep cwd the same, which is true 99% of time except:\n\n- update-index and read-tree hold the lock on $GIT_DIR/index really\n  early, then later on may call setup_work_tree() to move cwd.\n\n- Suppose a lock is being held (e.g. by \"git add\") then somewhere\n  down the line, somebody calls real_path (e.g. \"link_alt_odb_entry\"),\n  which temporarily moves cwd away and back.\n\nDuring that time when cwd is moved (either permanently or temporarily)\nand we decide to die(), attempts to remove relative *.lock will fail,\nand the next operation will complain that some files are still locked.\n\nAvoid this case by turning relative paths to absolute before storing\nthe path in \"filename\" field.\n\nReported-by: Yue Lin Ho <yuelinho777@gmail.com>\nHelped-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\nHelped-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nAdapted-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/fa137f67a40bbcb3f583920586fdd34ce98ddeaf"},{"sha":"f1a35295c2b66d2501f034d864afb2c5d8bb0e08","author":{"email":"6f5ccf8c3f31fed36c8213408711400d90769bde@raz.or.at","name":"Bernhard Reiter"},"message":"imap-send: use parse options API to determine verbosity\n\nThe -v/-q options were sort-of supported but without using the\nparse-options API, and were not documented.\n\nSigned-off-by: Bernhard Reiter <ockham@raz.or.at>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/f1a35295c2b66d2501f034d864afb2c5d8bb0e08"},{"sha":"1e16b255b95b45374db0b0cf69ef0ecce768ac27","author":{"email":"6f5ccf8c3f31fed36c8213408711400d90769bde@raz.or.at","name":"Bernhard Reiter"},"message":"git-imap-send: use libcurl for implementation\n\nUse libcurl's high-level API functions to implement git-imap-send\ninstead of the previous low-level OpenSSL-based functions.\n\nSince version 7.30.0, libcurl's API has been able to communicate with\nIMAP servers. Using those high-level functions instead of the current\nones would reduce imap-send.c by some 1200 lines of code. For now,\nthe old ones are wrapped in #ifdefs, and the new functions are enabled\nby make if curl's version is >= 7.34.0, from which version on curl's\nCURLOPT_LOGIN_OPTIONS (enabling IMAP authentication) parameter has been\navailable. The low-level functions will still be used for tunneling\ninto the server for now.\n\nAs I don't have access to that many IMAP servers, I haven't been able to\ntest the new code with a wide variety of parameter combinations. I did\ntest both secure and insecure (imaps:// and imap://) connections and\nvalues of \"PLAIN\" and \"LOGIN\" for the authMethod.\n\nIn order to suppress a sparse warning about \"using sizeof on a\nfunction\", we use the same solution used in commit 9371322a6\n(\"sparse: suppress some \"using sizeof on a function\" warnings\",\n06-10-2013) which solved exactly this problem for the other commands\nusing libcurl.\n\nHelped-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\nSigned-off-by: Bernhard Reiter <ockham@raz.or.at>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/1e16b255b95b45374db0b0cf69ef0ecce768ac27"},{"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":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/073281e2aea7177e27de8a46c5463e2f83833412"},{"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":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/d37239536ce960af9292fdf297e7c277303e95be"},{"sha":"aca56064f4eebe2ba46a55908b5cfa3b4ffa6785","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"t9001: style modernisation phase #1\n\nDon't chop test_expect_success line into pieces and concatenate with\n'\\'.  That's so 2005.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/aca56064f4eebe2ba46a55908b5cfa3b4ffa6785"},{"sha":"03335f22959d4ca0176a3073e1670380d3294711","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"t9001: style modernisation phase #2\n\nIndent is done with HTs, not a run of SPs.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/03335f22959d4ca0176a3073e1670380d3294711"},{"sha":"acd72b563652b646e65f2a90668b57a854fb3d12","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"t9001: style modernisation phase #3\n\nUse write_script.  The resulting patch makes it a lot easier\nto understand what the written script is doing.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/acd72b563652b646e65f2a90668b57a854fb3d12"},{"sha":"ee756a8161734e28490616f05ba895182424490b","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"t9001: style modernisation phase #4\n\nTwo general shell script codingstyles.\n\n - No SP between redirection operator and its target\n - One SP on both sides of () in \"name () {\" that begins a shell function\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/ee756a8161734e28490616f05ba895182424490b"},{"sha":"0720a51b29cdeb3927280669557068e636913128","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"t9001: style modernisation phase #5\n\nTwo general shell script codingstyles around here-text.\n\n - Quote the <<\\END_OF_HERE_TEXT string when there is no parameter\n   substitution going on to reduce cognitive load of the reader.\n\n - Indent the text with <<-\\END_OF_HERE_TEXT when able to make it\n   easier to spot boundaries of the tests.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/0720a51b29cdeb3927280669557068e636913128"},{"sha":"83c9433e679635f8fbf8961081ea3581c93ca778","author":{"email":"4cae768182109762e6a6b82a062ec574b1b294dd@freebsd.org","name":"Alfred Perlstein"},"message":"git-svn: support for git-svn propset\n\nThis change allows git-svn to support setting subversion properties.\n\nIt is useful for manually setting properties when committing to a\nsubversion repo that *requires* properties to be set without requiring\nmoving your changeset to separate subversion checkout in order to\nset props.\n\nThis change is initially from David Fraser, appearing at:\n\n  http://mid.gmane.org/1927112650.1281253084529659.JavaMail.root@klofta.sjsoft.com>\n\nThey are now forward-ported to most recent git along with fixes to\ndeal with files in subdirectories.\n\nStyle and functional changes from Eric Wong have been taken\nin their entirety from:\n\n  http://mid.gmane.org/20141201094911.GA13931@dcvr.yhbt.net\n\nThere is a nit to point out: the code does not support\nadding props unless there are also content changes to the files as\nwell.  This is demonstrated in the testcase.\n\n[ew - simplify Git.pm usage for check-attr\n    - improve shell portability for tests\n    - minor phrasing changes in commit message]\n\nSigned-off-by: David Fraser <davidf@sjsoft.com>\nSigned-off-by: Alfred Perlstein <alfred@freebsd.org>\nSigned-off-by: Eric Wong <normalperson@yhbt.net>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/83c9433e679635f8fbf8961081ea3581c93ca778"},{"sha":"a46e41fca301be48130cca80b45027eff328903d","author":{"email":"c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","name":"Michael Haggerty"},"message":"t1400: add some more tests of \"update-ref --stdin\"'s verify command\n\nTwo of the tests fail because\n\n    verify refs/heads/foo\n\nwith no argument (not even zeros) actually *deletes* refs/heads/foo.\nThis problem will be fixed in the next commit.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/a46e41fca301be48130cca80b45027eff328903d"},{"sha":"0e729c7ed5b3c0c6be38bf8d8405b1b7f5a74a3f","author":{"email":"c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","name":"Michael Haggerty"},"message":"update-ref: fix \"verify\" command with missing <oldvalue>\n\nIf \"git update-ref --stdin\" was given a \"verify\" command with no\n\"<newvalue>\" at all (not even zeros), the code was mistakenly setting\nhave_old=0 (and leaving old_sha1 uninitialized). But this is\nincorrect: this command is supposed to verify that the reference\ndoesn't exist. So in this case we really need old_sha1 to be set to\nnull_sha1 and have_old to be set to 1.\n\nMoreover, since have_old was being set to zero, *no* check of the old\nvalue was being done, so the new value of the reference was being set\nunconditionally to the value in new_sha1. new_sha1, in turn, was set\nto null_sha1 in the expectation that that was the old value and it\nshouldn't be changed. But because the precondition was not being\nchecked, the result was that the reference was being deleted\nunconditionally.\n\nSo, if <oldvalue> is missing, set have_old unconditionally and set\nold_sha1 to null_sha1.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nAcked-by: Brad King <brad.king@kitware.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/0e729c7ed5b3c0c6be38bf8d8405b1b7f5a74a3f"},{"sha":"11f70a7e29ff7167e89aad186d763a4b017e48d9","author":{"email":"6410387d42ac69b5c3f5c2acf34f310f72f9d2c7@corrigendum.ru","name":"Роман Донченко"},"message":"send-email: align RFC 2047 decoding more closely with the spec\n\nMore specifically:\n\n* Add \"\\\" to the list of characters not allowed in a token (see RFC 2047\n  errata).\n\n* Share regexes between unquote_rfc2047 and is_rfc2047_quoted. Besides\n  removing duplication, this also makes unquote_rfc2047 more stringent.\n\n* Allow both \"q\" and \"Q\" to identify the encoding.\n\n* Allow lowercase hexadecimal digits in the \"Q\" encoding.\n\nAnd, more on the cosmetic side:\n\n* Change the \"encoded-text\" regex to exclude rather than include characters,\n  for clarity and consistency with \"token\".\n\nSigned-off-by: Роман Донченко <dpb@corrigendum.ru>\nAcked-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/alexhenrie/git-po/commits/11f70a7e29ff7167e89aad186d763a4b017e48d9"}]}