GitHub PushEvent at 2014-12-05 23:43:39
Repository: git
Actor: gitster
Payload: {"shas":[["39942766ab9bc738f49f93d4c8ea68ffbaadc305","5f50a84c1fa3bcff146405017f36aec1a10a9e38@quinot.org","git_connect: set ssh shell command in GIT_SSH_COMMAND\n\nIt may be impractical to install a wrapper script for GIT_SSH\nwhen additional parameters need to be passed. Provide an alternative\nway of specifying a shell command to be run, including command line\narguments, by means of the GIT_SSH_COMMAND environment variable,\nwhich behaves like GIT_SSH but is passed to the shell.\n\nThe special circuitry to modify parameters in the case of using\nPuTTY's plink/tortoiseplink is activated only when using GIT_SSH;\nin the case of using GIT_SSH_COMMAND, it is deliberately left up to\nthe user to make any required parameters adaptation before calling\nthe underlying ssh implementation.\n\nSigned-off-by: Thomas Quinot <thomas@quinot.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Thomas Quinot",false],["a2bae2dce1fc2fe14894d46e01ee093b5704941a","2da278a99b557fc93ddbed7517a413ad793e2e6a@web.de","use args member of struct child_process\n\nConvert users of struct child_process to using the managed argv_array\nargs instead of providing their own.  This shortens the code a bit and\nensures that the allocated memory is released automatically after use.\n\nSuggested-by: Jeff King <peff@peff.net>\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","René Scharfe",false],["511726e4b191ad76e7b4875d8f2361b05d5cfb39","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","builtin/notes: fix premature failure when trying to add the empty blob\n\nThis fixes a small buglet when trying to explicitly add the empty blob\nas a note object using the -c or -C option to git notes add/append.\nInstead of failing with a nonsensical error message indicating that the\nempty blob does not exist, we should rather behave as if an empty notes\nmessage was given (e.g. using -m \"\" or -F /dev/null).\n\nThe next patch contains a test that verifies the fixed behavior.\n\nFound-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["d0923b6d4c01e3c5b86d56b1741292eda7c181fe","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","t3301: verify that 'git notes' removes empty notes by default\n\nAdd test cases documenting the current behavior when trying to\nadd/append/edit empty notes. This is in preparation for adding\n--allow-empty; to allow empty notes to be stored.\n\nImproved-by: Eric Sunshine <sunshine@sunshineco.com>\nImproved-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["bebf5c04767b3c67dadfa8b65e6f0ceb258f6b83","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","builtin/notes: improve naming\n\nIn preparation for some needed refactoring, rename struct msg_arg to\nstruct note_data, and rename its instances from \"msg\" to \"d\" (also\nremoving some unnecessary parentheses). The 'msg_arg' name was\ninherited from tag.c, but is not really a good name for the contents\nof a note.\n\nAlso rename write_note_data() to copy_obj_to_fd(), which more aptly\ndescribes what it actually does: Copying the contents of a git object\n(given by its SHA1) into a given file descriptor.\n\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["4282af0fc91e7a2667f8cba7282a5b70347f6e6f","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","builtin/notes: refactor note file path into struct note_data\n\nMove the 'path' variable from create_note() and into the\nnote_data struct. Unify cleanup of note_data objects with\na free_note_data() function.\n\nThis might not make too much sense on its own, but it makes the\nfuture refactoring of create_note() considerably cleaner.\n\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["b0de56c6a5bb41da71babafefc9207b0fc211d66","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","builtin/notes: simplify early exit code in add()\n\nRemove the need for 'retval' and the unnecessary goto. Also reorganize\nto only call free_note_data() is actually needed.\n\nImproved-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["52694cdabbf68f19c8289416e7bb3bbef41d8d27","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","builtin/notes: split create_note() to clarify add vs. remove logic\n\ncreate_note() has a non-trivial interface, and comprises three loosely\nrelated parts:\n\n 1. launching the editor with the note contents, if needed\n 2. appending to an existing note, if append_only was given\n 3. adding or removing the resulting note, based on whether it's non-empty\n\nSplit it along those lines to make the logic clearer: The first part\ngoes into a new function - prepare_note_data(), with a simpler interface.\nThe second part is moved into append_edit(), which is the only user of\nthis code. Finally, the add vs. remove decision is moved into the callers\n(add() and append_edit()), keeping the logic for writing the actual note\nobject in a separate function: write_note_data().\n\nSuggested-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["d73a5b933db1e722faa54d6709e89e2450d7c1e3","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","builtin/notes: add --allow-empty, to allow storing empty notes\n\nAlthough the \"git notes\" man page advertises that we support binary-safe\nnotes addition (using the -C option), we currently do not support adding\nthe empty note (i.e. using the empty blob to annotate an object). Instead,\nan empty note is always treated as an intent to remove the note\naltogether.\n\nIntroduce the --allow-empty option to the add/append/edit subcommands,\nto explicitly allow an empty note to be stored into the notes tree.\n\nAlso update the documentation, and add test cases for the new option.\n\nReported-by: James H. Fisher <jhf@trifork.com>\nImproved-by: Kyle J. McKay <mackyle@gmail.com>\nImproved-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["8a4acd699536c518c9245714d6175aa39d13eb9d","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","notes: empty notes should be shown by 'git log'\n\nIf the user has gone through the trouble of explicitly adding an empty\nnote, then \"git log\" should not silently skip it (as if it didn't exist).\n\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["c4f901d1593f3ef097c3e73daa2847ed9ad9efe0","43c3644fbb19a52dd978818b473d19c5e7fe210f@inventati.org","builtin: move builtin retrieval to get_builtin()\n\nThere was a redundant code for a builtin command retrieval in\n'handle_builtin()' and 'is_builtin()'.\n\nIntroduce a new function 'get_builtin()' and using it from\nboth of these places to reduce the redundancy.\n\nSigned-off-by: Slavomir Vlcek <svlc@inventati.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Slavomir Vlcek",false],["c5326bd62b7e168ba1339dacb7ee812d0fe98c7c","696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","checkout $tree: do not throw away unchanged index entries\n\nWhen we \"git checkout $tree\", we pull paths from $tree into\nthe index, and then check the resulting entries out to the\nworktree. Our method for the first step is rather\nheavy-handed, though; it clobbers the entire existing index\nentry, even if the content is the same. This means we lose\nour stat information, leading checkout_entry to later\nrewrite the entire file with identical content.\n\nInstead, let's see if we have the identical entry already in\nthe index, in which case we leave it in place. That lets\ncheckout_entry do the right thing. Our tests cover two\ninteresting cases:\n\n  1. We make sure that a file which has no changes is not\n     rewritten.\n\n  2. We make sure that we do update a file that is unchanged\n     in the index (versus $tree), but has working tree\n     changes. We keep the old index entry, and\n     checkout_entry is able to realize that our stat\n     information is out of date.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jeff King",false],["908a3203632a02568df230c0fccf9a2cd8da24e6","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","t3301: modernize style\n\nMake this test script appear somewhat less old-fashioned:\n\n - Use test helper functions:\n    - write_script\n    - test_commit\n    - test_write_lines\n    - test_line_count\n    - test_config\n    - test_unconfig\n    - test_path_is_missing\n\n - Remove whitespace between redirection operators and their targets.\n\n - Move preparation of \"expect\" files into tests.\n\n - Rename \"output\" files to \"actual\".\n\n - More consistent quoting, especially around commands that might\n   expand to nothing.\n\n - More visibility of important whitespace with ${indent}.\n\n - Combine pairs of tests that unnecessarily split setup and verification.\n\nImproved-by: Eric Sunshine <sunshine@sunshineco.com>\nImproved-by: Junio C Hamano <gitster@pobox.com>\nImproved-by: Michael Blume <blume.mike@gmail.com>\nImproved-by: Jeff King <peff@peff.net>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland",false],["ba6fad02b6cbbfbf5acf3303b4d8ddfd8624fdb2","fd432345609ae4d58c1aa629cb66ba96d1391622@kdbg.org","Windows: correct detection of EISDIR in mingw_open()\n\nAccording to the Linux open(2) man page, open() must return EISDIR\nif a directory was attempted to be opened for writing. Our emulation\nin mingw_open() does not get this right: it checks only for O_CREAT.\n\nFix it to check for a write request.\n\nThis fixes a failure in reflog handling, which opens files with\nO_APPEND|O_WRONLY, but without O_CREAT, and expects EISDIR when the\nnamed file happens to be a directory.\n\nSigned-off-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johannes Sixt",false],["83915ba5219955e8c0b747ec413afe4f78bea289","2da278a99b557fc93ddbed7517a413ad793e2e6a@web.de","use labs() for variables of type long instead of abs()\n\nUsing abs() on long values can cause truncation, so use labs() instead.\nReported by Clang 3.5 (-Wabsolute-value, enabled by -Wall).\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","René Scharfe",false],["31a8aa1ee84f4fba7597b0fa2e99f94596c079bb","2da278a99b557fc93ddbed7517a413ad793e2e6a@web.de","use labs() for variables of type long instead of abs()\n\nUsing abs() on long values can cause truncation, so use labs() instead.\nReported by Clang 3.5 (-Wabsolute-value, enabled by -Wall).\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","René Scharfe",false],["1f32ecffd864ea5b339883f94463b0b69f4aeb35","c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu","create_default_files(): don't set u+x bit on $GIT_DIR/config\n\nSince time immemorial, the test of whether to set \"core.filemode\"\nhas been done by trying to toggle the u+x bit on $GIT_DIR/config,\nwhich we know always exists, and then testing whether the change\n\"took\".  I find it somewhat odd to use the config file for this\ntest, but whatever.\n\nThe test code didn't set the u+x bit back to its original state\nitself, instead relying on the subsequent call to git_config_set()\nto re-write the config file with correct permissions.\n\nBut ever since\n\n    daa22c6f8d config: preserve config file permissions on edits (2014-05-06)\n\ngit_config_set() copies the permissions from the old config file to\nthe new one.  This is a good change in and of itself, but it\ninvalidates the create_default_files()'s assumption, causing \"git\ninit\" to leave the executable bit set on $GIT_DIR/config.\n\nReset the permissions on $GIT_DIR/config when we are done with the\ntest in create_default_files().\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Michael Haggerty",false],["13dbf46a397260675a16b506314b0b2ed9713bbb","696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net","gitweb: hack around CGI's list-context param() handling\n\nAs of CGI.pm's 4.08 release, the behavior to call\nCGI::param() in a list context is deprecated (because it can\nbe potentially unsafe if called inside a hash constructor).\nThis causes gitweb to issue a warning for some of our code,\nwhich in turn causes the tests to fail.\n\nOur use is in fact _not_ one of the dangerous cases, as we\nare intentionally using a list context. The recommended\nroute by 4.08 is to use the new CGI::multi_param() call to\nmake it explicit that we know what we are doing.\nHowever, that function is only available in 4.08, which is\nabout a month old; we cannot rely on having it.\n\nOne option would be to set $CGI::LIST_CONTEXT_WARN globally,\nwhich turns off the warning. However, that would eliminate\nthe protection these newer releases are trying to provide.\nWe want to annotate each site as OK using the new function.\n\nSo instead, let's check whether CGI provides the\nmulti_param() function, and if not, provide an\nimplementation that just wraps param(). That will work on\nboth old and new versions of CGI. Sadly, we cannot just\ncheck defined(\\&CGI::multi_param), because CGI uses the\nautoload feature, which claims that all functions are\ndefined. Instead, we just do a version check.\n\nSigned-off-by: Jeff King <peff@peff.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jeff King",false],["ae1dcc52c1d4189f21dd59ae6f93ff4582727ce4","5e07529257ac64421a7abe0f150c013a0a4ba688@gmx.de","l10n: de.po: fix typos\n\nSigned-off-by: Hartmut Henkel <hartmut_henkel@gmx.de>\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>","Hartmut Henkel",false],["ff51f5619d52410e4343c7cd75889e7d07f5659e","61b5e6324abee2d58ba2cf49f31c723faf6fd946@gmail.com","Merge branch 'master' of https://github.com/ralfth/git-po-de\n\n* 'master' of https://github.com/ralfth/git-po-de:\n  l10n: de.po: fix typos","Jiang Xin",false]],"size":33,"ref":"refs/heads/master","head":"c18b86734113ee2aeb0e140c922c8fbd4accc860"}