{"push_id":2370041657,"size":7,"distinct_size":7,"ref":"refs/heads/pw/add-p-recount","head":"88d0aea28f2dfafad63af35462ea3584cff83ea3","before":"a89db85800a0c1ff52adb18007fb7afb957ab491","commits":[{"sha":"902f414a72b29ca9c6c575faf29cc2b0b8b4fe1c","author":{"name":"Phillip Wood","email":"e89fac1614aebedba40fbb2455081bece6d46bfe@dunelm.org.uk"},"message":"t3701: don't hard code sha1 hash values\n\nUse a filter when comparing diffs to fix the value of non-zero hashes\nin diff index lines so we're not hard coding sha1 hash values in the\nexpected output. This makes it easier to change the expected output if\na test is edited as we don't need to worry about the exact hash value\nand means the tests will work when the hash algorithm is transitioned\naway from sha1.\n\nThanks-to: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/szeder/git-cooking-topics-for-travis-ci/commits/902f414a72b29ca9c6c575faf29cc2b0b8b4fe1c"},{"sha":"23fea4c240218d519da01e6d2d64264084a7334c","author":{"name":"Phillip Wood","email":"e89fac1614aebedba40fbb2455081bece6d46bfe@dunelm.org.uk"},"message":"t3701: add failing test for pathological context lines\n\nWhen a hunk is skipped by add -i the offsets of subsequent hunks are\nnot adjusted to account for any missing insertions due to the skipped\nhunk. Most of the time this does not matter as apply uses the context\nlines to apply the subsequent hunks in the correct place, however in\npathological cases the context lines will match at the now incorrect\noffset and the hunk will be applied in the wrong place. The offsets of\nhunks following an edited hunk that has had the number of insertions\nor deletions changed also need to be updated in the same way. Add\nfailing tests to demonstrate this.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/szeder/git-cooking-topics-for-travis-ci/commits/23fea4c240218d519da01e6d2d64264084a7334c"},{"sha":"fecc6f3a6862c55dee0e9a2390acaf4b23991fef","author":{"name":"Phillip Wood","email":"e89fac1614aebedba40fbb2455081bece6d46bfe@dunelm.org.uk"},"message":"add -p: adjust offsets of subsequent hunks when one is skipped\n\nSince commit 8cbd431082 (\"git-add--interactive: replace hunk\nrecounting with apply --recount\", 2008-7-2) if a hunk is skipped then\nwe rely on the context lines to apply subsequent hunks in the right\nplace. While this works most of the time it is possible for hunks to\nend up being applied in the wrong place. To fix this adjust the offset\nof subsequent hunks to correct for any change in the number of\ninsertions or deletions due to the skipped hunk. The change in offset\ndue to edited hunks that have the number of insertions or deletions\nchanged is ignored here, it will be fixed in the next commit.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/szeder/git-cooking-topics-for-travis-ci/commits/fecc6f3a6862c55dee0e9a2390acaf4b23991fef"},{"sha":"3801341ceccac73fd2e2fc3385ce22ab10c7a97d","author":{"name":"Phillip Wood","email":"e89fac1614aebedba40fbb2455081bece6d46bfe@dunelm.org.uk"},"message":"add -p: calculate offset delta for edited patches\n\nRecount the number of preimage and postimage lines in a hunk after it\nhas been edited so any change in the number of insertions or deletions\ncan be used to adjust the offsets of subsequent hunks. If an edited\nhunk is subsequently split then the offset correction will be lost. It\nwould be possible to fix this if it is a problem, however the code\nhere is still an improvement on the status quo for the common case\nwhere an edited hunk is applied without being split.\n\nThis is also a necessary step to removing '--recount' and\n'--allow-overlap' from the invocation of 'git apply'. Before\n'--recount' can be removed the splitting and coalescing counting needs\nto be fixed to handle a missing newline at the end of a file. In order\nto remove '--allow-overlap' there needs to be i) some way of verifying\nthe offset data in the edited hunk (probably by correlating the\npreimage (or postimage if the patch is going to be applied in reverse)\nlines of the edited and unedited versions to see if they are offset or\nif any leading/trailing context lines have been removed) and ii) a way of\ndealing with edited hunks that change context lines that are shared\nwith neighbouring hunks.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/szeder/git-cooking-topics-for-travis-ci/commits/3801341ceccac73fd2e2fc3385ce22ab10c7a97d"},{"sha":"a550ba6a270261139089caaef5fcab42fc108d87","author":{"name":"Phillip Wood","email":"e89fac1614aebedba40fbb2455081bece6d46bfe@dunelm.org.uk"},"message":"add -p: fix counting when splitting and coalescing\n\nWhen a file has no trailing new line at the end diff records this by\nappending \"\\ No newline at end of file\" below the last line of the\nfile. This line should not be counted in the hunk header. Fix the\nsplitting and coalescing code to count files without a trailing new line\nproperly and change one of the tests to test splitting without a\ntrailing new line.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/szeder/git-cooking-topics-for-travis-ci/commits/a550ba6a270261139089caaef5fcab42fc108d87"},{"sha":"4da31b14e6f9fcfe968d533a107dae575aaf545c","author":{"name":"Phillip Wood","email":"e89fac1614aebedba40fbb2455081bece6d46bfe@dunelm.org.uk"},"message":"add -p: don't rely on apply's '--recount' option\n\nNow that add -p counts patches properly it should be possible to turn\noff the '--recount' option when invoking 'git apply'\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/szeder/git-cooking-topics-for-travis-ci/commits/4da31b14e6f9fcfe968d533a107dae575aaf545c"},{"sha":"88d0aea28f2dfafad63af35462ea3584cff83ea3","author":{"name":"SZEDER Gábor","email":"2d7398648c7656faf78ca9ed84ec90025e532b11@gmail.com"},"message":"Travis CI build adjustments\n\ntravis-ci: run tests with '-x' tracing\nt/README: add a note about don't saving stderr of compound commands\nt1510-repo-setup: mark as untraceable with '-x'\nt9903-bash-prompt: don't check the stderr of __git_ps1()\nt5570-git-daemon: don't check the stderr of a subshell\nt5526: use $TRASH_DIRECTORY to specify the path of GIT_TRACE log file\nt5500-fetch-pack: don't check the stderr of a subshell\nt3030-merge-recursive: don't check the stderr of a subshell\nt1507-rev-parse-upstream: don't check the stderr of a shell function\nt: add means to disable '-x' tracing for individual test scripts\nt: prevent '-x' tracing from interfering with test helpers' stderr\ntravis-ci: show Coccinelle's results, if any\ntravis-ci: run static analysis with two parallel jobs\ndescribe: use strbuf_add_unique_abbrev() for adding short hashes\nUse MOVE_ARRAY\ncocci: use format keyword instead of a literal string\ntravis-ci: run GETTEXT POISON build job in scrambled mode, too\ngettext: introduce GIT_GETTEXT_POISON=scrambled\ngettext: use an enum for the mode of GETTEXT POISONing\ngettext: put \"# GETTEXT POISON #\" string literal into a macro\ngettext: #ifdef away GETTEXT POISON-related code from _() and Q_()\nlib-rebase: loosen GETTEXT_POISON check in fake editor\ngettext: don't poison if GIT_GETTEXT_POISON is set but empty\ntest-lib.sh: preserve GIT_GETTEXT_POISON from the environment\ntravis-ci: make the OSX build jobs' 'brew update' more quiet\ntravis-ci: squelch 'prove' progress indicator\ntravis-ci: include the trash directories of failed tests in the trace log\ntravis-ci: don't fail if user already exists on 32 bit Linux build job\ntravis-ci: don't run the test suite as root in the 32 bit Linux build\ntravis-ci: don't repeat the path of the cache directory\ntravis-ci: use 'set -e' in the 32 bit Linux build job\ntravis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build\ntravis-ci: build Git during the 'script' phase","distinct":true,"url":"https://api.github.com/repos/szeder/git-cooking-topics-for-travis-ci/commits/88d0aea28f2dfafad63af35462ea3584cff83ea3"}]}
{"actor":{"display_login":"szeder"}}