{"push_id":694221085,"size":50,"distinct_size":5,"ref":"refs/heads/pt/am-foreign-patch","head":"6034c0b5068ed0ed8aab94e6364b4f19f456b697","before":"8c48672b8b008dd8a30712b317eedaedf75c017e","commits":[{"sha":"c998b381477953361c8bf180871ecd6b57ff94ea","author":{"email":"ca5433e1cdd25b4a4001c54525dea593b33edc0c@gmail.com","name":"Paul Tan"},"message":"t5520: prevent field splitting in content comparisons\n\nMany tests in t5520 used the following to test the contents of files:\n\n\ttest `cat file` = expected\n\nor\n\n\ttest $(cat file) = expected\n\nThese 2 forms, however, will be affected by field splitting and,\ndepending on the value of $IFS, may be split into multiple arguments,\nmaking the test fail in mysterious ways.\n\nReplace the above 2 forms with:\n\n\ttest \"$(cat file)\" = expected\n\nas quoting the command substitution will prevent field splitting.\n\nSigned-off-by: Paul Tan <pyokagan@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/c998b381477953361c8bf180871ecd6b57ff94ea"},{"sha":"d12f455e44bc3c90bf06b7123cebe0c82a039c63","author":{"email":"ca5433e1cdd25b4a4001c54525dea593b33edc0c@gmail.com","name":"Paul Tan"},"message":"t5520: test no merge candidates cases\n\na8c9bef (pull: improve advice for unconfigured error case, 2009-10-05)\nfully established the current advices given by git-pull for the\ndifferent cases where git-fetch will not have anything marked for merge:\n\n1. We fetched from a specific remote, and a refspec was given, but it\n   ended up not fetching anything. This is usually because the user\n   provided a wildcard refspec which had no matches on the remote end.\n\n2. We fetched from a non-default remote, but didn't specify a branch to\n   merge. We can't use the configured one because it applies to the\n   default remote, and thus the user must specify the branches to merge.\n\n3. We fetched from the branch's or repo's default remote, but:\n\n   a. We are not on a branch, so there will never be a configured branch\n      to merge with.\n\n   b. We are on a branch, but there is no configured branch to merge\n      with.\n\n4. We fetched from the branch's or repo's default remote, but the\n   configured branch to merge didn't get fetched (either it doesn't\n   exist, or wasn't part of the configured fetch refspec)\n\nImplement tests for the above 5 cases to ensure that the correct code\npaths are triggered for each of these cases.\n\nSigned-off-by: Paul Tan <pyokagan@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/d12f455e44bc3c90bf06b7123cebe0c82a039c63"},{"sha":"d55ef3e04459a5f1a24f494b873d8590f2523add","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"t4015: modernise style\n\nMove the preparatory steps that create the expected output inside\nthe test bodies, remove unnecessary blank lines before and after the\ntest bodies, and drop SP between redirection operator and its target.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/d55ef3e04459a5f1a24f494b873d8590f2523add"},{"sha":"0ad782f2406fa13f626653a001b5f01a9f3fa40f","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"t4015: separate common setup and per-test expectation\n\nThe last two tests in the script were to\n\n - set up color.diff.* slots\n - set up an expectation for a single test\n - run that test and check the result\n\nbut split in a wrong way.  It did the first two in the first test\nand the third one in the second test.  The latter two belong to each\nother.  This matters when you plan to add more of these tests that\nshare the common coloring.\n\nWhile at it, make sure we use a color different from old, which is\nalso red.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/0ad782f2406fa13f626653a001b5f01a9f3fa40f"},{"sha":"0e383e185ae57a8ee6ba015a43749f6d34fe3c9a","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"diff.c: add emit_del_line() and emit_context_line()\n\nTraditionally, we only had emit_add_line() helper, which knows how\nto find and paint whitespace breakages on the given line, because we\nonly care about whitespace breakages introduced in new lines.  The\ncontext lines and old (i.e. deleted) lines are emitted with a\nsimpler emit_line_0() that paints the entire line in plain or old\ncolors.\n\nIdentify callers of emit_line_0() that show deleted lines and\ncontext lines, have them call new helpers, emit_del_line() and\nemit_context_line(), so that we can later tweak what is done to\nthese two classes of lines.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/0e383e185ae57a8ee6ba015a43749f6d34fe3c9a"},{"sha":"b8767f791c15f119554c1466af60e4f2433ae971","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"diff.c: --ws-error-highlight=<kind> option\n\nTraditionally, we only cared about whitespace breakages introduced\nin new lines.  Some people want to paint whitespace breakages on old\nlines, too.  When they see a whitespace breakage on a new line, they\ncan spot the same kind of whitespace breakage on the corresponding\nold line and want to say \"Ah, those breakages are there but they\nwere inherited from the original, so let's not touch them for now.\"\n\nIntroduce `--ws-error-highlight=<kind>` option, that lets them pass\na comma separated list of `old`, `new`, and `context` to specify\nwhat lines to highlight whitespace errors on.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/b8767f791c15f119554c1466af60e4f2433ae971"},{"sha":"8ade009c952b2977508d6d88aacc290c645125d2","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"clone: use OPT_STRING_LIST for --reference\n\nNot only does this save us having to implement a custom\ncallback, but it handles \"--no-reference\" in the usual way\n(to clear the list).\n\nThe generic callback does copy the string, which we don't\ntechnically need, but that should not hurt anything.\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/pyokagan/git/commits/8ade009c952b2977508d6d88aacc290c645125d2"},{"sha":"14f8b9b494c990188a4dfe772c384b1be5f8351b","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"clone: reorder --dissociate and --reference options\n\nThese options are intimately related, so it makes sense to\nlist them nearby in the \"-h\" output (they are already\nadjacent in the manpage).\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/pyokagan/git/commits/14f8b9b494c990188a4dfe772c384b1be5f8351b"},{"sha":"a5e2499e5421c88ec2403087597613d60b8f3077","author":{"email":"c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","name":"Michael Haggerty"},"message":"verify_lock(): return 0/-1 rather than struct ref_lock *\n\nIts return value wasn't conveying any extra information, but it made\nthe reader wonder whether the ref_lock that it returned might be\ndifferent than the one that was passed to it. So change the function\nto the traditional \"return 0 on success or a negative value on error\".\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/a5e2499e5421c88ec2403087597613d60b8f3077"},{"sha":"f41d6329704a8c3f7286f52c3589d381ac0bc79d","author":{"email":"c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","name":"Michael Haggerty"},"message":"verify_lock(): on errors, let the caller unlock the lock\n\nThe caller already knows how to do it, so always do it in the same\nplace.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/f41d6329704a8c3f7286f52c3589d381ac0bc79d"},{"sha":"74b15bfbf6f7efffa40fda170b3a3cb0218d8651","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"diff: accept color.diff.context as a synonym for \"plain\"\n\nThe term \"plain\" is a bit ambiguous; let's allow the more\nspecific \"context\", but keep \"plain\" around for\ncompatibility.\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/pyokagan/git/commits/74b15bfbf6f7efffa40fda170b3a3cb0218d8651"},{"sha":"8dbf3eb6850d6d9495ace908625fe50888b111e6","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT\n\nThe latter is a much more descriptive name (and we support\n\"color.diff.context\" now). This also updates the name of any\nlocal variables which were used to store the color.\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/pyokagan/git/commits/8dbf3eb6850d6d9495ace908625fe50888b111e6"},{"sha":"33ffc176d65e1e98e1eea262dc7827830c33c56d","author":{"email":"c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","name":"Michael Haggerty"},"message":"verify_lock(): report errors via a strbuf\n\nInstead of writing error messages directly to stderr, write them to\na \"strbuf *err\".  The caller, lock_ref_sha1_basic(), uses this error\nreporting convention with all the other callees, and reports its\nerror this way to its callers.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/33ffc176d65e1e98e1eea262dc7827830c33c56d"},{"sha":"000f0da57aca00d6ff960f0763dee73c34cd7677","author":{"email":"c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","name":"Michael Haggerty"},"message":"verify_lock(): do not capitalize error messages\n\nOur convention is for error messages to start with a lower-case\nletter.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/000f0da57aca00d6ff960f0763dee73c34cd7677"},{"sha":"c2e0a718c66760efebf7b348aef48dc1f885bc2a","author":{"email":"c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","name":"Michael Haggerty"},"message":"ref_transaction_commit(): do not capitalize error messages\n\nOur convention is for error messages to start with a lower-case\nletter.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/c2e0a718c66760efebf7b348aef48dc1f885bc2a"},{"sha":"f5f53f141087e8ba663d650399e8683c1fc6700b","author":{"email":"dfcd2f34d690a5d2e9fb8a87b73ba8e2d399daa0@gmail.com","name":"Miguel Torroja"},"message":"p4: retrieve the right revision of the file in UTF-16 codepath\n\nFixing bug with UTF-16 files when they are retrieved by git-p4.  It\nwas always getting the tip version of the file and the history of\nthe file was lost.\n\nSigned-off-by: Miguel Torroja <miguel.torroja@gmail.com>\nAcked-by: Luke Diamand <luke@diamand.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/pyokagan/git/commits/f5f53f141087e8ba663d650399e8683c1fc6700b"},{"sha":"a1293ef7c3690829a6ac47fc45f3f26b96b5c9f5","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"read-cache.c: drop PROT_WRITE from mmap of index\n\nOnce upon a time, git's in-memory representation of a cache\nentry actually pointed to the mmap'd on-disk data. So in\n520fc24 (Allow writing to the private index file mapping.,\n2005-04-26), we specified PROT_WRITE so that we could tweak\nthe entries while we run (in our own MAP_PRIVATE copy-on-write\nversion, of course).\n\nLater, 7a51ed6 (Make on-disk index representation separate\nfrom in-core one, 2008-01-14) stopped doing this; we copy\nthe data into our in-core representation, and then drop the\nmmap immediately. We can therefore drop the PROT_WRITE flag.\nIt's probably not hurting anything as it is, but it's\npotentially confusing.\n\nNote that we could also mark the mapping as \"const\" to\nverify that we never write to it. However, we don't\ntypically do that for our other maps, as it then requires\ncasting to munmap() it.\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/pyokagan/git/commits/a1293ef7c3690829a6ac47fc45f3f26b96b5c9f5"},{"sha":"3a1b3126ed5a0b51d5b1fdba827c92bf2acf5fc6","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"config.c: fix mmap leak when writing config\n\nWe mmap the existing config file, but fail to unmap it if we\nhit an error. The function already has a shared exit path,\nso we can fix this by moving the mmap pointer to the\nfunction scope and clearing it in the shared exit.\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/pyokagan/git/commits/3a1b3126ed5a0b51d5b1fdba827c92bf2acf5fc6"},{"sha":"1570856b510e3722a3620063e7ba209106b75857","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"config.c: avoid xmmap error messages\n\nThe config-writing code uses xmmap to map the existing\nconfig file, which will die if the map fails. This has two\ndownsides:\n\n  1. The error message is not very helpful, as it lacks any\n     context about the file we are mapping:\n\n       $ mkdir foo\n       $ git config --file=foo some.key value\n       fatal: Out of memory? mmap failed: No such device\n\n  2. We normally do not die in this code path; instead, we'd\n     rather report the error and return an appropriate exit\n     status (which is part of the public interface\n     documented in git-config.1).\n\nThis patch introduces a \"gentle\" form of xmmap which lets us\nproduce our own error message. We do not want to use mmap\ndirectly, because we would like to use the other\ncompatibility elements of xmmap (e.g., handling 0-length\nmaps portably).\n\nThe end result is:\n\n    $ git.compile config --file=foo some.key value\n    error: unable to mmap 'foo': No such device\n    $ echo $?\n    3\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/pyokagan/git/commits/1570856b510e3722a3620063e7ba209106b75857"},{"sha":"0e8771f1984c468b0f41a8c779c034ffc48530e5","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"config.c: rewrite ENODEV into EISDIR when mmap fails\n\nIf we try to mmap a directory, we'll get ENODEV. This\ntranslates to \"no such device\" for the user, which is not\nvery helpful. Since we've just fstat()'d the file, we can\neasily check whether the problem was a directory to give a\nbetter message.\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/pyokagan/git/commits/0e8771f1984c468b0f41a8c779c034ffc48530e5"}]}