{"push_id":1286711555,"size":17,"distinct_size":3,"ref":"refs/heads/pre-merge-hook","head":"0a7b28e1978f8f748b1879e62a276b84918990ae","before":"79dfaa33f0e128daba70f2641737fe8d2b682c5c","commits":[{"sha":"800d88e2b3dde41ebf34e2e00955bba892419555","author":{"name":"Tran Ngoc Quan","email":"6899e4747de1b258ed21ac65d90cc3deddf2cf13@gmail.com"},"message":"l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)\n\nSigned-off-by: Tran Ngoc Quan <vnwildman@gmail.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/800d88e2b3dde41ebf34e2e00955bba892419555"},{"sha":"8576fde6cb4013a41d162e33f7a0046a5ea6801e","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"cache: add empty_tree_oid object and helper function\n\nSimilar to is_null_oid(), and is_empty_blob_sha1() add an\nempty_tree_oid along with helper function is_empty_tree_oid(). For\ncompleteness, also add an \"is_empty_tree_sha1()\",\n\"is_empty_blob_sha1()\", \"is_empty_tree_oid()\" and \"is_empty_blob_oid()\"\nhelpers.\n\nTo ensure we only get one singleton, implement EMPTY_BLOB_SHA1_BIN as\nsimply getting the hash of empty_blob_oid structure.\n\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/8576fde6cb4013a41d162e33f7a0046a5ea6801e"},{"sha":"cd48dadb8d840637f0f55b1ad0d8f50d892c767d","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"diff.c: remove output_prefix_length field\n\n\"diff/log --stat\" has a logic that determines the display columns\navailable for the diffstat part of the output and apportions it for\npathnames and diffstat graph automatically.\n\n5e71a84a (Add output_prefix_length to diff_options, 2012-04-16)\nadded the output_prefix_length field to diff_options structure to\nallow this logic to subtract the display columns used for the\nhistory graph part from the total \"terminal width\"; this matters\nwhen the \"git log --graph -p\" option is in use.\n\nThe field must be set to the number of display columns needed to\nshow the output from the output_prefix() callback, which is error\nprone.  As there is only one user of the field, and the user has the\nactual value of the prefix string, let's get rid of the field and\nhave the user count the display width itself.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/cd48dadb8d840637f0f55b1ad0d8f50d892c767d"},{"sha":"660e113ce11840f4bc4028bff89889e6122fe89a","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"graph: add support for --line-prefix on all graph-aware output\n\nAdd an extension to git-diff and git-log (and any other graph-aware\ndisplayable output) such that \"--line-prefix=<string>\" will print the\nadditional line-prefix on every line of output.\n\nTo make this work, we have to fix a few bugs in the graph API that force\ngraph_show_commit_msg to be used only when you have a valid graph.\nAdditionally, we extend the default_diff_output_prefix handler to work\neven when no graph is enabled.\n\nThis is somewhat of a hack on top of the graph API, but I think it\nshould be acceptable here.\n\nThis will be used by a future extension of submodule display which\ndisplays the submodule diff as the actual diff between the pre and post\ncommit in the submodule project.\n\nAdd some tests for both git-log and git-diff to ensure that the prefix\nis honored correctly.\n\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/660e113ce11840f4bc4028bff89889e6122fe89a"},{"sha":"61cfbc054d8341c3276efbf1380a2be0ee435dba","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"diff: prepare for additional submodule formats\n\nA future patch will add a new format for displaying the difference of\na submodule. Make it easier by changing how we store the current\nselected format. Replace the DIFF_OPT flag with an enumeration, as each\nformat will be mutually exclusive.\n\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/61cfbc054d8341c3276efbf1380a2be0ee435dba"},{"sha":"99b43a61f2daf5fe183056e5bf2a75a8a81a28bf","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"allow do_submodule_path to work even if submodule isn't checked out\n\nCurrently, do_submodule_path will attempt locating the .git directory by\nusing read_gitfile on <path>/.git. If this fails it just assumes the\n<path>/.git is actually a git directory.\n\nThis is good because it allows for handling submodules which were cloned\nin a regular manner first before being added to the superproject.\n\nUnfortunately this fails if the <path> is not actually checked out any\nlonger, such as by removing the directory.\n\nFix this by checking if the directory we found is actually a gitdir. In\nthe case it is not, attempt to lookup the submodule configuration and\nfind the name of where it is stored in the .git/modules/ directory of\nthe superproject.\n\nIf we can't locate the submodule configuration, this might occur because\nfor example a submodule gitlink was added but the corresponding\n.gitmodules file was not properly updated.  A die() here would not be\npleasant to the users of submodule diff formats, so instead, modify\ndo_submodule_path() to return an error code:\n\n - git_pathdup_submodule() returns NULL when we fail to find a path.\n - strbuf_git_path_submodule() propagates the error code to the caller.\n\nModify the callers of these functions to check the error code and fail\nproperly. This ensures we don't attempt to use a bad path that doesn't\nmatch the corresponding submodule.\n\nBecause this change fixes add_submodule_odb() to work even if the\nsubmodule is not checked out, update the wording of the submodule log\ndiff format to correctly display that the submodule is \"not initialized\"\ninstead of \"not checked out\"\n\nAdd tests to ensure this change works as expected.\n\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/99b43a61f2daf5fe183056e5bf2a75a8a81a28bf"},{"sha":"602a283afb225ea094f4582e02e94cfd7f5cabf0","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"submodule: convert show_submodule_summary to use struct object_id *\n\nSince we're going to be changing this function in a future patch, lets\ngo ahead and convert this to use object_id now.\n\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/602a283afb225ea094f4582e02e94cfd7f5cabf0"},{"sha":"8e6df65015f9a947d9ccca8950c2d60a4600cba2","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"submodule: refactor show_submodule_summary with helper function\n\nA future patch is going to add a new submodule diff format which\ndisplays an inline diff of the submodule changes. To make this easier,\nand to ensure that both submodule diff formats use the same initial\nheader, factor out show_submodule_header() function which will print the\ncurrent submodule header line, and then leave the show_submodule_summary\nfunction to lookup and print the submodule log format.\n\nThis does create one format change in that \"(revision walker failed)\"\nwill now be displayed on its own line rather than as part of the message\nbecause we no longer perform this step directly in the header display\nflow. However, this is a rare case as most causes of the failure will be\ndue to a missing commit which we already check for and avoid previously.\nflow. However, this is a rare case and shouldn't impact much.\n\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/8e6df65015f9a947d9ccca8950c2d60a4600cba2"},{"sha":"fd47ae6a5b9cc0cfc56c1f7c43db612d26ca4b75","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"diff: teach diff to display submodule difference with an inline diff\n\nTeach git-diff and friends a new format for displaying the difference\nof a submodule. The new format is an inline diff of the contents of the\nsubmodule between the commit range of the update. This allows the user\nto see the actual code change caused by a submodule update.\n\nAdd tests for the new format and option.\n\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/fd47ae6a5b9cc0cfc56c1f7c43db612d26ca4b75"},{"sha":"e8e349249c86550d3505c4abfac28caf3d13df46","author":{"name":"Jiang Xin","email":"3e3281a50dedbce6917ec986fe9061f1682f0b89@gmail.com"},"message":"Merge branch 'master' of https://github.com/vnwildman/git\n\n* 'master' of https://github.com/vnwildman/git:\n  l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/e8e349249c86550d3505c4abfac28caf3d13df46"},{"sha":"dd39dfcf8adbe7dafddaf32010ee4d351b99e5f5","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po\n\nl10n-2.10.0-rnd2.2\n\n* tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po:\n  l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/dd39dfcf8adbe7dafddaf32010ee4d351b99e5f5"},{"sha":"6ebdac1bab966b720d776aa43ca188fe378b1f4b","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Git 2.10\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/6ebdac1bab966b720d776aa43ca188fe378b1f4b"},{"sha":"734e42c9fbbf04d87aca06817ff570d51709a880","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'jk/diff-submodule-diff-inline' into next\n\nThe \"git diff --submodule={short,log}\" mechanism has been enhanced\nto allow \"--submodule=diff\" to show the patch between the submodule\ncommits bound to the superproject.\n\n* jk/diff-submodule-diff-inline:\n  diff: teach diff to display submodule difference with an inline diff\n  submodule: refactor show_submodule_summary with helper function\n  submodule: convert show_submodule_summary to use struct object_id *\n  allow do_submodule_path to work even if submodule isn't checked out\n  diff: prepare for additional submodule formats\n  graph: add support for --line-prefix on all graph-aware output\n  diff.c: remove output_prefix_length field\n  cache: add empty_tree_oid object and helper function","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/734e42c9fbbf04d87aca06817ff570d51709a880"},{"sha":"f2ff48496e8dc270b21b0290a2a3e4ef98e352ed","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Sync with 2.10 final","distinct":false,"url":"https://api.github.com/repos/mjg/git/commits/f2ff48496e8dc270b21b0290a2a3e4ef98e352ed"},{"sha":"1f2b788f756b7054f2ea55500dd75c79ec8b9ff1","author":{"name":"Michael J Gruber","email":"5bf00c93c9250d44d769b81890fa6584403ae7e0@drmicha.warpmail.net"},"message":"git-merge: Honor pre-merge hook\n\ngit-merge does not honor the pre-commit hook when doing automatic merge\ncommits, and for compatibility reasons this is going to stay.\n\nIntroduce a pre-merge hook which is called for an automatic merge commit\njust like pre-commit is called for a non-automatic merge commit (or any\nother commit).","distinct":true,"url":"https://api.github.com/repos/mjg/git/commits/1f2b788f756b7054f2ea55500dd75c79ec8b9ff1"},{"sha":"07a149cfb9e0a701ede04030bfea222e2327e4da","author":{"name":"Michael J Gruber","email":"5bf00c93c9250d44d769b81890fa6584403ae7e0@drmicha.warpmail.net"},"message":"merge: --no-verify to bypass pre-merge hook\n\nAnalogous to commit, introduce a '--no-verify' option which bypasses the\npre-merge hook. The shorthand '-n' is taken by the (non-existing)\n'--no-stat' already.","distinct":true,"url":"https://api.github.com/repos/mjg/git/commits/07a149cfb9e0a701ede04030bfea222e2327e4da"},{"sha":"0a7b28e1978f8f748b1879e62a276b84918990ae","author":{"name":"Michael J Gruber","email":"5bf00c93c9250d44d769b81890fa6584403ae7e0@drmicha.warpmail.net"},"message":"t7503: add tests for pre-merge-hook\n\nAdd tests which make sure that the pre-merge-hook is called when\npresent, allows/disallows merge commits depending on its return value\nand is suppressed by \"--no-verify\".","distinct":true,"url":"https://api.github.com/repos/mjg/git/commits/0a7b28e1978f8f748b1879e62a276b84918990ae"}]}
{"actor":{"display_login":"mjg"}}