{"push_id":707512256,"size":19,"distinct_size":1,"ref":"refs/heads/next","head":"7c9b531a96f3c89bdfcefc77e2f3d7b65e437194","before":"3f8b1d03318d3e5eff389ac0d3568f45053ae1fd","commits":[{"sha":"78cc1a540ba127b13f2f3fd531777b57f3a9cd46","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Revert \"diff-lib.c: adjust position of i-t-a entries in diff\"\n\nThis reverts commit d95d728aba06a34394d15466045cbdabdada58a2.\n\nIt turns out that many other commands that need to interact with the\nresult of running diff-files and diff-index, e.g.  \"git apply\", \"git\nrm\", etc., need to be adjusted to the new world order it brings in.\nFor example, it would break this sequence to correct a whitespace\nbreakage in the parts you changed:\n\n\tgit add -N file\n\tgit diff --cached file | git apply --cached --whitespace=fix\n\tgit checkout file\n\nIn the old world order, \"diff\" showed a patch to modify an existing\nempty file by adding its full contents, and \"apply\" updated the\nindex by modifying the existing empty blob (which is what an\nIntent-to-Add entry records in the index) with that patch.\n\nIn the new world order, \"diff\" shows a patch to create a new file\nwith its full contents, but because \"apply\" thinks that the i-t-a\nentry already exists in the index, it refused to accept a creation.\n\nAdjusting \"apply\" to this new world order is easy, but we need to\nassess the extent of the damage to the rest of the system the new\nworld order brought in before going forward and adjust them all,\nafter which we can resurrect the commit being reverted here.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/78cc1a540ba127b13f2f3fd531777b57f3a9cd46"},{"sha":"e2c6f7cd5a66ed0009662d2651e0cf3c655e83a9","author":{"email":"3f465f92b896a0cffa56d66f3cf7f14fc3025706@bloomberg.net","name":"Charles Bailey"},"message":"Fix definition of ARRAY_SIZE for non-gcc builds\n\nThe improved ARRAY_SIZE macro uses BARF_UNLESS_AN_ARRAY which expands\nto a valid check for recent gcc versions and to 0 for older gcc\nversions but is not defined on non-gcc builds.\n\nNon-gcc builds need this macro to expand to 0 as well. The current outer\ntest (defined(__GNUC__) && (__GNUC__ >= 3)) is a strictly weaker\ncondition than the inner test (GIT_GNUC_PREREQ(3, 1)) so we can omit the\nouter test and cause the BARF_UNLESS_AN_ARRAY macro to be defined\ncorrectly on non-gcc builds as well as gcc builds with older versions.\n\nSigned-off-by: Charles Bailey <cbailey32@bloomberg.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/e2c6f7cd5a66ed0009662d2651e0cf3c655e83a9"},{"sha":"16272c7db4cf647d86de89ee46b248013109529d","author":{"email":"289741c60b69b343d9b8693d6a6d3fa684dc8954@gmail.com","name":"Christian Neukirchen"},"message":"cvsimport: silence regex warning appearing in Perl 5.22.\n\nSince Perl 5.22, \"A literal '{' should now be escaped in a pattern\".\nSilence the recently added warning by using \\{ instead.\n\nSigned-off-by: Christian Neukirchen <chneukirchen@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/16272c7db4cf647d86de89ee46b248013109529d"},{"sha":"b5496cbd2291443b0ad0bf686db51fce6ffad863","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'nd/diff-i-t-a'\n\n* nd/diff-i-t-a:\n  Revert \"diff-lib.c: adjust position of i-t-a entries in diff\"","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/b5496cbd2291443b0ad0bf686db51fce6ffad863"},{"sha":"f249409b6be74132e80e6d83f264aaa158563be1","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'mm/rebase-i-post-rewrite-exec' into maint\n\n\"git rebase -i\" fired post-rewrite hook when it shouldn't (namely,\nwhen it was told to stop sequencing with 'exec' insn).\n\n* mm/rebase-i-post-rewrite-exec:\n  t5407: use <<- to align the expected output\n  rebase -i: fix post-rewrite hook with failed exec command\n  rebase -i: demonstrate incorrect behavior of post-rewrite","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/f249409b6be74132e80e6d83f264aaa158563be1"},{"sha":"c53312583b2d25b6ed5f0aa421993795743d1da6","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint\n\nRecent \"git prune\" traverses young unreachable objects to safekeep\nold objects in the reachability chain from them, which sometimes\ncaused error messages that are unnecessarily alarming.\n\n* jk/squelch-missing-link-warning-for-unreachable:\n  suppress errors on missing UNINTERESTING links\n  silence broken link warnings with revs->ignore_missing_links\n  add quieter versions of parse_{tree,commit}","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/c53312583b2d25b6ed5f0aa421993795743d1da6"},{"sha":"c5baf18a404a9713e1b75161855cacbfec32fcf2","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/diagnose-config-mmap-failure' into maint\n\nThe configuration reader/writer uses mmap(2) interface to access\nthe files; when we find a directory, it barfed with \"Out of memory?\".\n\n* jk/diagnose-config-mmap-failure:\n  xmmap(): drop \"Out of memory?\"\n  config.c: rewrite ENODEV into EISDIR when mmap fails\n  config.c: avoid xmmap error messages\n  config.c: fix mmap leak when writing config\n  read-cache.c: drop PROT_WRITE from mmap of index","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/c5baf18a404a9713e1b75161855cacbfec32fcf2"},{"sha":"6998d890c7120fe2d30fa0b6f80ddfaad716f632","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/color-diff-plain-is-context' into maint\n\n\"color.diff.plain\" was a misnomer; give it 'color.diff.context' as\na more logical synonym.\n\n* jk/color-diff-plain-is-context:\n  diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT\n  diff: accept color.diff.context as a synonym for \"plain\"","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/6998d890c7120fe2d30fa0b6f80ddfaad716f632"},{"sha":"6356003c80c744eefdd49d76bb587184d900228f","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'pt/pull-tags-error-diag' into maint\n\nThere was a dead code that used to handle \"git pull --tags\" and\nshow special-cased error message, which was made irrelevant when\nthe semantics of the option changed back in Git 1.9 days.\n\n* pt/pull-tags-error-diag:\n  pull: remove --tags error in no merge candidates case","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/6356003c80c744eefdd49d76bb587184d900228f"},{"sha":"f2bd231414fc9c22307971bcc6c5a3a96dec75c1","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/die-on-bogus-worktree-late' into maint\n\nThe setup code used to die when core.bare and core.worktree are set\ninconsistently, even for commands that do not need working tree.\n\n* jk/die-on-bogus-worktree-late:\n  setup_git_directory: delay core.bare/core.worktree errors","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/f2bd231414fc9c22307971bcc6c5a3a96dec75c1"},{"sha":"68538cf9545ff853518b29fcac8e6bbe00a97f56","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'sb/pack-protocol-mention-smart-http' into maint\n\nDoc updates.\n\n* sb/pack-protocol-mention-smart-http:\n  Documentation/technical/pack-protocol: mention http as possible protocol","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/68538cf9545ff853518b29fcac8e6bbe00a97f56"},{"sha":"5fd72277d468ecf6b5685dbff14e8a4b2de8eb77","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/make-fix-dependencies' into maint\n\nBuild clean-up.\n\n* jk/make-fix-dependencies:\n  Makefile: silence perl/PM.stamp recipe\n  Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS\n  Makefile: drop dependency between git-instaweb and gitweb","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/5fd72277d468ecf6b5685dbff14e8a4b2de8eb77"},{"sha":"ebf4fc90da239f1005d2c5b1a4278cfe51430151","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'sg/merge-summary-config' into maint\n\nDoc updates.\n\n* sg/merge-summary-config:\n  Documentation: include 'merge.branchdesc' for merge and config as well","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/ebf4fc90da239f1005d2c5b1a4278cfe51430151"},{"sha":"0df0541bf13723658d31b8d1376b505b710e63c6","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Git 2.4.5\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/0df0541bf13723658d31b8d1376b505b710e63c6"},{"sha":"a6a1ad9b257a6ce4b236644993894772b57fd12a","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Sync with 2.4.5","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/a6a1ad9b257a6ce4b236644993894772b57fd12a"},{"sha":"5416f8af0f632d05371868bc4340327e1672c83c","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'cb/array-size'\n\n* cb/array-size:\n  Fix definition of ARRAY_SIZE for non-gcc builds","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/5416f8af0f632d05371868bc4340327e1672c83c"},{"sha":"c82b6d3f4ba871ef65e25f9c336eb7c46f92e367","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'cn/cvsimport-perl-update'\n\n* cn/cvsimport-perl-update:\n  cvsimport: silence regex warning appearing in Perl 5.22.","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/c82b6d3f4ba871ef65e25f9c336eb7c46f92e367"},{"sha":"7ecec52d42a964c4a8e9f6ca41bb0b5ce00049b4","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Git 2.5.0-rc0\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/sunny256/git/commits/7ecec52d42a964c4a8e9f6ca41bb0b5ce00049b4"},{"sha":"7c9b531a96f3c89bdfcefc77e2f3d7b65e437194","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Sync with v2.5.0-rc0\n\n* master:\n  Git 2.5.0-rc0\n  Git 2.4.5\n  cvsimport: silence regex warning appearing in Perl 5.22.\n  Fix definition of ARRAY_SIZE for non-gcc builds\n  Revert \"diff-lib.c: adjust position of i-t-a entries in diff\"","distinct":true,"url":"https://api.github.com/repos/sunny256/git/commits/7c9b531a96f3c89bdfcefc77e2f3d7b65e437194"}]}