{"push_id":693269528,"size":88,"distinct_size":3,"ref":"refs/heads/pre-merge-hook","head":"d8c5ec1b472f3bd652291ff03696e4a341878c2d","before":"9d173789632e6d537ba7ab721b82576cb45c3782","commits":[{"sha":"ad6e8ed37bc139c64b1b75a7a9ff6e4054f71756","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"apply: reject a hunk that does not do anything\n\nA hunk like this in a hand-edited patch without correctly adjusting\nthe line counts:\n\n     @@ -660,2 +660,2 @@ inline struct sk_buff *ieee80211_authentic...\n             auth = (struct ieee80211_authentication *)\n                     skb_put(skb, sizeof(struct ieee80211_authentication));\n     -       some old text\n     +       some new text\n     --\n     2.1.0\n\n     dev mailing list\n\nat the end of the input does not have a good way for us to diagnose\nit as a corrupt patch.  We just read two context lines and discard\nthe remainder as cruft, which we must do in order to ignore the\ne-mail footer.  Notice that the patch does not change anything and\nsignal an error.\n\nNote that this fix will not help if the hand-edited hunk header were\n\"@@ -660,3, +660,2\" to include the removal.  We would just remove\nthe old text without adding the new one, and treat \"+ some new text\"\nand everything after that line as trailing cruft.  So it is dubious\nthat this patch alone would help very much in practice, but it may\nbe better than nothing.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/ad6e8ed37bc139c64b1b75a7a9ff6e4054f71756"},{"sha":"8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5","author":{"email":"6224b3efda5ec833c72988a4dd2b3e71e920de40@gmail.com","name":"Quentin Neill"},"message":"blame: add blame.showEmail configuration\n\nComplement existing --show-email option with fallback\nconfiguration variable, with tests.\n\nSigned-off-by: Quentin Neill <quentin.neill@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5"},{"sha":"5c3494ed880b56eb2e487fd5504bc66674151bae","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: further document missing sendmail aliases functionality\n\nSendmail aliases[1] supports expansion to a file (\"/path/name\") or\npipe (\"|command\"), as well as file inclusion (\":include: /path/name\"),\nhowever, our implementation does not support such functionality.\n\n[1]: https://www.freebsd.org/cgi/man.cgi?query=aliases&sektion=5\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/5c3494ed880b56eb2e487fd5504bc66674151bae"},{"sha":"818a2d7722de03a16177e2323fa7b77624722e2a","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: visually distinguish sendmail aliases parser warnings\n\nAlthough emitted to stderr, warnings from the sendmail aliases parser\nare not visually distinguished as such, and thus can easily be\noverlooked in the normal noisy send-email output.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/818a2d7722de03a16177e2323fa7b77624722e2a"},{"sha":"2cdaabb6f9294a6ee618abcd1d60a21569a1fd51","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: drop noise comments which merely repeat what code says\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/2cdaabb6f9294a6ee618abcd1d60a21569a1fd51"},{"sha":"22e3b46ff95ac01add2d1e8874708b06c9e7db91","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: fix style: cuddle 'elsif' and 'else' with closing brace\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/22e3b46ff95ac01add2d1e8874708b06c9e7db91"},{"sha":"09f1157bbf5daa8a4fd8de1d25edbb8961d44521","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: refactor sendmail aliases parser\n\nThe sendmail aliases parser inlined into %parse_alias is already\nuncomfortably large and is expected to grow as additional functionality\nis implemented, so extract it to improve manageability.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/09f1157bbf5daa8a4fd8de1d25edbb8961d44521"},{"sha":"020be85f5153e2a3a231e40fe81af9e4a1c01cd4","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: simplify sendmail aliases comment and blank line recognizer\n\nReplace unnecessarily complex regular expression for recognizing comment\nand blank lines in sendmail aliases with idiomatic expressions which\ncan be easily understood at a glance.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/020be85f5153e2a3a231e40fe81af9e4a1c01cd4"},{"sha":"2532dd0605b15eeed41312558bf5babb50290236","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: implement sendmail aliases line continuation support\n\nLogical lines in sendmail aliases files can be spread over multiple\nphysical lines[1]. A line beginning with whitespace is folded into the\npreceding line. A line ending with '\\' consumes the following line.\n\n[1]: https://www.freebsd.org/cgi/man.cgi?query=aliases&sektion=5\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/2532dd0605b15eeed41312558bf5babb50290236"},{"sha":"514554cf53757298f948e3b53ddb55f7c922bfa1","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"t9001: refactor sendmail aliases test infrastructure\n\nSeveral new tests of sendmail aliases parsing will be added in a\nsubsequent patch, so factor out functionality common to all of them\ninto a new helper function.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/514554cf53757298f948e3b53ddb55f7c922bfa1"},{"sha":"6be02640301a7517c76792f5b0e7c978e6961022","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"t9001: add sendmail aliases line continuation tests\n\nA line beginning with whitespace is folded into the preceding line.\nA line ending with '\\' consumes the following line.\n\nWhile here, also test an empty sendmail aliases file.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/6be02640301a7517c76792f5b0e7c978e6961022"},{"sha":"86b898487a13483a1b6a5dc7f26a1f103fb2574d","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"send-email: further warn about unsupported sendmail aliases features\n\nThe sendmail aliases parser diagnoses unsupported features and\nunrecognized lines. For completeness, also warn about unsupported\nredirection to \"/path/name\" and \"|command\", as well as \":include:\".\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/86b898487a13483a1b6a5dc7f26a1f103fb2574d"},{"sha":"9b7a61d7dab1635607b1b5be480ac78944cafb45","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"format-patch: do not feed tags to clear_commit_marks()\n\n\"git format-patch --ignore-if-in-upstream A..B\", when either A or B\nis a tag, failed miserably.\n\nThis is because the code passes the tips it used for traversal to\nclear_commit_marks(), after running a temporary revision traversal\nto enumerate the commits on both branches to find if they have\ncommits that make equivalent changes.  The revision traversal\nmachinery knows how to enumerate commits reachable starting from a\ntag, but clear_commit_marks() wants to take nothing but a commit.\n\nIn the longer term, it might be a more correct fix to teach\nclear_commit_marks() to do the same \"committish to commit\"\ndereferencing that is done in the revision traversal machinery,\nbut for now this fix should suffice.\n\nReported-by: Bruce Korb <bruce.korb@gmail.com>\nHelped-by: Christian Couder <christian.couder@gmail.com>\nHelped-by: brian m. carlson <sandals@crustytoothpaste.net>\nHelped-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/9b7a61d7dab1635607b1b5be480ac78944cafb45"},{"sha":"2c9c1c517896ece5003489adac6eaae5f7ad27b3","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'pt/pull-tests' into pt/pull-optparse\n\n* pt/pull-tests:\n  t5520: check reflog action in fast-forward merge\n  t5521: test --dry-run does not make any changes\n  t5520: test --rebase failure on unborn branch with index\n  t5520: test --rebase with multiple branches\n  t5520: test work tree fast-forward when fetch updates head\n  t5520: test for failure if index has unresolved entries\n  t5520: test no merge candidates cases\n  t5520: prevent field splitting in content comparisons","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/2c9c1c517896ece5003489adac6eaae5f7ad27b3"},{"sha":"eb2a8d9ed3fca2ba2f617b704992d483605f3bb6","author":{"email":"ca5433e1cdd25b4a4001c54525dea593b33edc0c@gmail.com","name":"Paul Tan"},"message":"pull: handle git-fetch's options as well\n\nWhile parsing the command-line arguments, git-pull stops parsing at the\nfirst unrecognized option, assuming that any subsequent options are for\ngit-fetch, and can thus be kept in the shell's positional parameters\nlist, so that it can be passed to git-fetch via the expansion of \"$@\".\n\nHowever, certain functions in git-pull assume that the positional\nparameters do not contain any options:\n\n* error_on_no_merge_candidates() uses the number of positional\n  parameters to determine which error message to print out, and will\n  thus print the wrong message if git-fetch's options are passed in as\n  well.\n\n* the call to get_remote_merge_branch() assumes that the positional\n  parameters only contains the optional repo and refspecs, and will\n  thus silently fail if git-fetch's options are passed in as well.\n\n* --dry-run is a valid git-fetch option, but if provided after any\n  git-fetch options, it is not recognized by git-pull and thus git-pull\n  will continue to run the merge or rebase.\n\nFix these bugs by teaching git-pull to parse git-fetch's options as\nwell. Add tests to prevent regressions.\n\nThis removes the limitation where git-fetch's options have to come after\ngit-merge's and git-rebase's options on the command line. Update the\ndocumentation to reflect this.\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/mjg/git/commits/eb2a8d9ed3fca2ba2f617b704992d483605f3bb6"},{"sha":"e3b601da2af53cbb9a63e59113d524a8d946ea12","author":{"email":"ca5433e1cdd25b4a4001c54525dea593b33edc0c@gmail.com","name":"Paul Tan"},"message":"pull: use git-rev-parse --parseopt for option parsing\n\nTo enable unambiguous parsing of abbreviated options, bundled short\noptions, separate form options and to provide consistent usage help, use\ngit-rev-parse --parseopt for option parsing. With this, simplify the\noption parsing code.\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/mjg/git/commits/e3b601da2af53cbb9a63e59113d524a8d946ea12"},{"sha":"414382fb00c72babe2b22ef0fa757ea7c960f5ce","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"ewah/bitmap: silence warning about MASK macro redefinition\n\nOn PowerPC Mac OS X (10.5.8 \"Leopard\" with Xcode 3.1),\nsystem header /usr/include/ppc/param.h[1] pollutes the\npreprocessor namespace with a macro generically named MASK.\nThis conflicts with the same-named macro in ewah/bitmap.c.\nWe can avoid this conflict by using a more specific name.\n\n[1]: Included indirectly via:\n     git-compat-util.h ->\n     sys/sysctl.h ->\n     sys/ucred.h ->\n     sys/param.h ->\n     machine/param.h ->\n     ppc/param.h\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\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/mjg/git/commits/414382fb00c72babe2b22ef0fa757ea7c960f5ce"},{"sha":"34b935c01f28d34f6764f0e1140ad47e7abdde1b","author":{"email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","name":"Jeff King"},"message":"ewah: use less generic macro name\n\nThe ewah/ewok.h header pollutes the global namespace with\n\"BITS_IN_WORD\", without any specific notion that we are\ntalking about the bits in an eword_t. We can give this the\nmore specific name \"BITS_IN_EWORD\".\n\nSigned-off-by: Jeff King <peff@peff.net>\nReviewed-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/34b935c01f28d34f6764f0e1140ad47e7abdde1b"},{"sha":"4e3687858e1bcd20865ad28fd6c2d05f421bed51","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases\n\nOn Mac OS X, getdelim() first became available with Xcode 4.1[1], which\nwas released the same day as OS X 10.7 \"Lion\", so assume getdelim()\navailability from 10.7 onward. (As of this writing, OS X is at 10.10\n\"Yosemite\".)\n\nAccording to Wikipedia[2], 4.1 was also available for download by paying\ndevelopers on OS X 10.6 \"Snow Leopard\", so it's possible that some 10.6\nmachines may have getdelim(). However, as strbuf's use of getdelim() is\npurely an optimization, let's be conservative and assume 10.6 and\nearlier lack getdelim().\n\n[1]: Or, possibly with Xcode 4.0, but that version is no longer\n     available for download, or not available to non-paying developers,\n     so testing is not possible.\n\n[2]: http://en.wikipedia.org/wiki/Xcode\n\nHelped-by: Jeff King <peff@peff.net>\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nReviewed-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/4e3687858e1bcd20865ad28fd6c2d05f421bed51"},{"sha":"96658060d7d4317fa5e6f9309d058bdc4fd129db","author":{"email":"8d6e34f987851aa599257d3831a1af040886842f@sunshineco.com","name":"Eric Sunshine"},"message":"configure: add getdelim() check\n\nAs an optimization, strbuf will take advantage of getdelim() if\navailable, so add a configure check which defines HAVE_GETDELIM if\nfound.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\nReviewed-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/96658060d7d4317fa5e6f9309d058bdc4fd129db"}]}