{"push_id":1345285019,"size":290,"distinct_size":276,"ref":"refs/heads/shears/next","head":"fb7a690ce46bd5886698c876fc742246ffe786bf","before":"203899213455de76877cdeeb1f6c706774d5eb51","commits":[{"sha":"b4391657ed96c8dd2881d5c9fcad39a07d8cb92a","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"merge: drop 'git merge <message> HEAD <commit>' syntax\n\nAnd then if we and our users survived the previous \"start warning if\nthe old syntax is used\" patch for a few years, we could apply this\nto actually drop the support for the ancient syntax.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/b4391657ed96c8dd2881d5c9fcad39a07d8cb92a"},{"sha":"3f7bd767ed6df4dbbc36c5ab881c0de668107001","author":{"name":"Jeff King","email":"7e57302763bea699aee296fb53304dc616ab92d5@peff.net"},"message":"files_read_raw_ref: avoid infinite loop on broken symlinks\n\nOur ref resolution first runs lstat() on any path we try to\nlook up, because we want to treat symlinks specially (by\nresolving them manually and considering them symrefs). But\nif the results of `readlink` do _not_ look like a ref, we\nfall through to treating it like a normal file, and just\nread the contents of the linked path.\n\nSince fcb7c76 (resolve_ref_unsafe(): close race condition\nreading loose refs, 2013-06-19), that \"normal file\" code\npath will stat() the file and if we see ENOENT, will jump\nback to the lstat(), thinking we've seen inconsistent\nresults between the two calls. But for a symbolic ref, this\nisn't a race: the lstat() found the symlink, and the stat()\nis looking at the path it points to. We end up in an\ninfinite loop calling lstat() and stat().\n\nWe can fix this by avoiding the retry-on-inconsistent jump\nwhen we know that we found a symlink. While we're at it,\nlet's add a comment explaining why the symlink case gets to\nthis code in the first place; without that, it is not\nobvious that the correct solution isn't to avoid the stat()\ncode path entirely.\n\nSigned-off-by: Jeff King <peff@peff.net>\nReviewed-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/3f7bd767ed6df4dbbc36c5ab881c0de668107001"},{"sha":"e8c42cb9ce6a566aad797cc6c5bc1279d608d819","author":{"name":"Jeff King","email":"7e57302763bea699aee296fb53304dc616ab92d5@peff.net"},"message":"files_read_raw_ref: prevent infinite retry loops in general\n\nLimit the number of retries to 3. That should be adequate to\nprevent any races, while preventing the possibility of\ninfinite loops if the logic fails to handle any other\npossible error modes correctly.\n\nAfter the fix in the previous commit, there's no known way\nto trigger an infinite loop, but I did manually verify that\nthis fixes the test in that commit even when the code change\nis not applied.\n\nSigned-off-by: Jeff King <peff@peff.net>\nReviewed-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/e8c42cb9ce6a566aad797cc6c5bc1279d608d819"},{"sha":"39ea59a2570547166834ceeff9ae0c0c05748f35","author":{"name":"René Scharfe","email":"01bf718383f1a71128a0f88aabe513a64e609746@web.de"},"message":"remove unnecessary NULL check before free(3)\n\nfree(3) handles NULL pointers just fine.  Add a semantic patch for\nremoving unnecessary NULL checks before calling this function, and\napply it on the code base.\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/39ea59a2570547166834ceeff9ae0c0c05748f35"},{"sha":"a94bb683970a111b467a36590ca36e52754ad504","author":{"name":"René Scharfe","email":"01bf718383f1a71128a0f88aabe513a64e609746@web.de"},"message":"use strbuf_add_unique_abbrev() for adding short hashes, part 3\n\nCall strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs\ninstead of taking detours through find_unique_abbrev() and its static\nbuffer.  This is shorter in most cases and a bit more efficient.\n\nThe changes here are not easily handled by a semantic patch because\nthey involve removing temporary variables and deconstructing format\nstrings for strbuf_addf().\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/a94bb683970a111b467a36590ca36e52754ad504"},{"sha":"087885049e38c38a437153055ff521567132b183","author":{"name":"Stefan Beller","email":"75e5af3a5fc6e432c184f339c5c73c118a246be6@google.com"},"message":"submodule: ignore trailing slash on superproject URL\n\nBefore 63e95beb0 (2016-04-15, submodule: port resolve_relative_url from\nshell to C), it did not matter if the superprojects URL had a trailing\nslash or not. It was just chopped off as one of the first steps\n(The \"remoteurl=${remoteurl%/}\" near the beginning of\nresolve_relative_url(), which was removed in said commit).\n\nWhen porting this to the C version, an off-by-one error was introduced\nand we did not check the actual last character to be a slash, but the\nNULL delimiter.\n\nReintroduce the behavior from before 63e95beb0, to ignore the trailing\nslash.\n\nReported-by: <venv21@gmail.com>\nHelped-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>\nSigned-off-by: Stefan Beller <sbeller@google.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/087885049e38c38a437153055ff521567132b183"},{"sha":"3389e78ec8cd117f981ce3963a901b66db6c8206","author":{"name":"Stefan Beller","email":"75e5af3a5fc6e432c184f339c5c73c118a246be6@google.com"},"message":"submodule: ignore trailing slash in relative url\n\nThis is similar to the previous patch, though no user reported a bug and\nI could not find a regressive behavior.\n\nHowever it is a good thing to be strict on the output and for that we\nalways omit a trailing slash.\n\nSigned-off-by: Stefan Beller <sbeller@google.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/3389e78ec8cd117f981ce3963a901b66db6c8206"},{"sha":"842a516cb02a53cf0291ff67ed6f8517966345c0","author":{"name":"Jakub Narębski","email":"c804b6c552cb95399e6313f58595cb2874d55cec@gmail.com"},"message":"configure.ac: improve description of NO_REGEX test\n\nThe commit 2f8952250a (\"regex: add regexec_buf() that can work on a\nnon NUL-terminated string\", 2016-09-21) changed description of\nNO_REGEX build config variable to be more neutral, and actually say\nthat it is about support for REG_STARTEND.  Change description in\nconfigure.ac to match.\n\nChange also the test message and variable name to match.  The test\njust checks that REG_STARTEND is #defined.\n\nIssue-found-by: Ramsay Jones <ramsay@ramsayjones.plus.com>\nSigned-off-by: Jakub Narębski <jnareb@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/842a516cb02a53cf0291ff67ed6f8517966345c0"},{"sha":"72710165c932edb2b8552aef7aef2f357dde4746","author":{"name":"Stefan Beller","email":"75e5af3a5fc6e432c184f339c5c73c118a246be6@google.com"},"message":"documentation: improve submodule.<name>.{url, path} description\n\nUnlike the url variable a user cannot override the the path variable,\nas it is part of the content together with the gitlink at the given\npath. To avoid confusion do not mention the .path variable in the config\nsection and rely on the documentation provided in gitmodules[5].\n\nEnhance the description of submodule.<name>.url and mention its two use\ncases separately.\n\nSigned-off-by: Stefan Beller <sbeller@google.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/72710165c932edb2b8552aef7aef2f357dde4746"},{"sha":"8827b3a8873ebfad79b324d6134c1ec4bbea5f06","author":{"name":"David Aguilar","email":"46a7f9d1a30407212a0554037e59d711a53991ef@gmail.com"},"message":"mergetool: add copyright\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\nReviewed-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/8827b3a8873ebfad79b324d6134c1ec4bbea5f06"},{"sha":"08221e3fa27396aca30cb539f006f78636782951","author":{"name":"David Aguilar","email":"46a7f9d1a30407212a0554037e59d711a53991ef@gmail.com"},"message":"mergetool: move main program flow into a main() function\n\nMake it easier to follow the program's flow by isolating all\nlogic into functions.  Isolate the main execution code path into\na single unit instead of having prompt_after_failed_merge()\ninterrupt it partyway through.\n\nThe use of a main() function is borrowing a convention from C,\nPython, Perl, and many other languages.  This helps readers more\nfamiliar with other languages understand the purpose of each\nfunction when diving into the codebase with fresh eyes.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\nReviewed-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/08221e3fa27396aca30cb539f006f78636782951"},{"sha":"57937f70a09c12ef484c290865dac4066d207c9c","author":{"name":"David Aguilar","email":"46a7f9d1a30407212a0554037e59d711a53991ef@gmail.com"},"message":"mergetool: honor diff.orderFile\n\nTeach mergetool to get the list of files to edit via `diff` so that we\ngain support for diff.orderFile.\n\nSuggested-by: Luis Gutierrez <luisgutz@gmail.com>\nHelped-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: David Aguilar <davvid@gmail.com>\nReviewed-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/57937f70a09c12ef484c290865dac4066d207c9c"},{"sha":"654311bf6ee0fbf530c088271c2c76d46f31f82d","author":{"name":"David Aguilar","email":"46a7f9d1a30407212a0554037e59d711a53991ef@gmail.com"},"message":"mergetool: honor -O<orderfile>\n\nTeach mergetool to pass \"-O<orderfile>\" down to `git diff` when\nspecified on the command-line.\n\nHelped-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: David Aguilar <davvid@gmail.com>\nReviewed-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/654311bf6ee0fbf530c088271c2c76d46f31f82d"},{"sha":"30cfe72d37ed8c174cae43923769730a94549dae","author":{"name":"René Scharfe","email":"01bf718383f1a71128a0f88aabe513a64e609746@web.de"},"message":"pretty: fix document link for color specification\n\nHelped-by: Jeff King <peff@peff.net>\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\nReviewed-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/30cfe72d37ed8c174cae43923769730a94549dae"},{"sha":"641c900b2c3a8c3d385eb353b3801a5f49ddbb47","author":{"name":"Johannes Schindelin","email":"c714eff280a95c3e5bbcc9303c4499eebb0d49aa@gmx.de"},"message":"reset: fix usage\n\nThe <tree-ish> parameter is actually optional (see man page).\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/641c900b2c3a8c3d385eb353b3801a5f49ddbb47"},{"sha":"8928c8b9b3cecca0cc941c3f88c29276c32e4098","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'jc/merge-drop-old-syntax' into next\n\nStop supporting \"git merge <message> HEAD <commit>\" syntax that has\nbeen deprecated since October 2007, and issues a deprecation\nwarning message since v2.5.0.\n\nIt has been reported that git-gui still uses the deprecated syntax,\nwhich needs to be fixed before this final step can proceed.\ncf. <5671DB28.8020901@kdbg.org>\n\n* jc/merge-drop-old-syntax:\n  merge: drop 'git merge <message> HEAD <commit>' syntax","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/8928c8b9b3cecca0cc941c3f88c29276c32e4098"},{"sha":"ac5c35f87fd9273c56a5f4e6754d3cf6f3cf42c6","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'jk/ref-symlink-loop' into next\n\nA stray symbolic link in $GIT_DIR/refs/ directory could make name\nresolution loop forever, which has been corrected.\n\n* jk/ref-symlink-loop:\n  files_read_raw_ref: prevent infinite retry loops in general\n  files_read_raw_ref: avoid infinite loop on broken symlinks","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/ac5c35f87fd9273c56a5f4e6754d3cf6f3cf42c6"},{"sha":"466a26548cd91d9c5f321448f392e8b51261e229","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'js/regexec-buf' into next\n\n* js/regexec-buf:\n  configure.ac: improve description of NO_REGEX test","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/466a26548cd91d9c5f321448f392e8b51261e229"},{"sha":"bbd6a884026931748ffb750dbd85c9384a91025e","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'rs/cocci' into next\n\nCode cleanup.\n\n* rs/cocci:\n  use strbuf_add_unique_abbrev() for adding short hashes, part 3\n  remove unnecessary NULL check before free(3)","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/bbd6a884026931748ffb750dbd85c9384a91025e"},{"sha":"e37425ed17ff86d6a23b57db822460ac83d2e3b3","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'sb/submodule-ignore-trailing-slash' into next\n\nA minor regression fix for \"git submodule\".\n\n* sb/submodule-ignore-trailing-slash:\n  submodule: ignore trailing slash in relative url\n  submodule: ignore trailing slash on superproject URL","distinct":true,"url":"https://api.github.com/repos/PKRoma/git-for-windows/commits/e37425ed17ff86d6a23b57db822460ac83d2e3b3"}]}
{"actor":{"display_login":"PKRoma"}}