{"push_id":1258721566,"size":9,"distinct_size":0,"ref":"refs/heads/jk/diff-submodule-diff-inline","head":"ef76c4bcf4476cbf824c4153d79d65b05879b97c","before":"924441a98e3bbeaa000a7e7fe0f132ecfbfd1d36","commits":[{"sha":"53199a99d1a472feb62a6f9cc235e8f2cef4a206","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/gitster/git/commits/53199a99d1a472feb62a6f9cc235e8f2cef4a206"},{"sha":"d12ee477c23a838f1dcb208ec1229a1b266e7f2e","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"SQUASH???","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/d12ee477c23a838f1dcb208ec1229a1b266e7f2e"},{"sha":"f7174877dcd71fadbc4657d5b48ad997e4e08bcb","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/gitster/git/commits/f7174877dcd71fadbc4657d5b48ad997e4e08bcb"},{"sha":"51269e4e365ce92b6a960808534dafa26c12abc6","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"SQUASH???","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/51269e4e365ce92b6a960808534dafa26c12abc6"},{"sha":"77aa11cf2486403db5592908dfab3938705eb898","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"submodule: allow add_submodule_odb to work even if path is not checked out\n\nCurrently, do_submodule_path will first try to locate the git directory\nusing read_gitfile on <path to submodule>/.git. If this fails, it goes\nahead and assumes the path is actually the git directory. This is good\nas it allows submodules which aren't stored in the superproject's .git\ndirectory to function correctly. However, in some cases the submodule is\nno longer locally checked out, but still has object data stored in the\nparent project's .git/modules/<path to submodule>.\n\nTo make this work, add code to check if we found a valid git directory.\nIf we haven't, then try the standard location of module data instead.\nThis has the advantage of allowing callers of do_submodule_path\n(add_submodule_odb) to correctly function even if the submodule isn't\ncurrently checked out, but was previously initialized.\n\nUpdate the wording of the submodule log diff format to correctly\ndisplay that the submodule is \"not initialized\" instead of \"not checked\nout\"\n\nAdd tests to ensure that even once we remove the submodule directory, it\nworks by checking in the .git directory.\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/gitster/git/commits/77aa11cf2486403db5592908dfab3938705eb898"},{"sha":"0f5558d3107e36f28a6b4ae8e674fd824ee8fc11","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/gitster/git/commits/0f5558d3107e36f28a6b4ae8e674fd824ee8fc11"},{"sha":"608f16fe8bf7cc48d87996ec1833eba8fb1e9add","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/gitster/git/commits/608f16fe8bf7cc48d87996ec1833eba8fb1e9add"},{"sha":"6840298bee6cd01df4167c4345d1b6dbb73627dd","author":{"name":"Jacob Keller","email":"e21f8f873cbf627d500cdb518f96bb2b01271c0a@gmail.com"},"message":"cache: add empty_tree_oid object\n\nAdd an empty_tree_oid object which can be used in place of\nEMPTY_TREE_SHA1_BIN_LITERAL for code which is being converted to struct\nobject_id.\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/gitster/git/commits/6840298bee6cd01df4167c4345d1b6dbb73627dd"},{"sha":"ef76c4bcf4476cbf824c4153d79d65b05879b97c","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/gitster/git/commits/ef76c4bcf4476cbf824c4153d79d65b05879b97c"}]}
{"actor":{"display_login":"gitster"}}