{"shas":[["73151df0cf3b324fc5f8980774601794c4b88204","b57189c5f2fd5b3daf3350a77fde90def1080fa5@gmail.com","tests: eliminate unnecessary setup test assertions\n\nMost of git's tests write files and define shell functions and\nvariables that will last throughout a test script at the top of\nthe script, before all test assertions:\n\n\t. ./test-lib.sh\n\n\tVAR='some value'\n\texport VAR\n\n\t>empty\n\n\tfn () {\n\t\tdo something\n\t}\n\n\ttest_expect_success 'setup' '\n\t\t... nontrivial commands go here ...\n\t'\n\nTwo scripts use a different style with this kind of trivial code\nenclosed by a test assertion; fix them.  The usual style is easier to\nread since there is less indentation to keep track of and no need to\nworry about nested quotes; and on the other hand, because the commands\nin question are trivial, it should not make the test suite any worse\nat catching future bugs in git.\n\nWhile at it, make some other small tweaks:\n\n - spell function definitions with a space before () for consistency\n   with other scripts;\n\n - use the self-contained command \"git mktree </dev/null\" in\n   preference to \"git write-tree\" which looks at the index when\n   writing an empty tree.\n\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jonathan Nieder"],["0d8fc3efc65df74a2b39b3f9798861a1b2055b62","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","merge: make branch.<name>.mergeoptions correctly override merge.<option>\n\nThe parsing of the additional command line parameters supplied to\nthe branch.<name>.mergeoptions configuration variable was implemented\nat the wrong stage.  If any merge-related variable came after we read\nbranch.<name>.mergeoptions, the earlier value was overwritten.\n\nWe should first read all the merge.* configuration, override them by\nreading from branch.<name>.mergeoptions and then finally read from\nthe command line.\n\nThis patch should fix it, even though I now strongly suspect that\nbranch.<name>.mergeoptions that gives a single command line that\nneeds to be parsed was likely to be an ill-conceived idea to begin\nwith.  Sigh...\n\nHelped-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["541d1fa85ca4741e8b6db281f3d788dcfc423bdc","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config\n\n* jc/maint-branch-mergeoptions:\n  merge: make branch.<name>.mergeoptions correctly override merge.<option>","Junio C Hamano"],["f23e8decd544c8f81b40c98211f6cb028fa70cdc","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","merge: introduce merge.ff configuration variable\n\nThis variable gives the default setting for --ff, --no-ff or --ff-only\noptions of \"git merge\" command.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["3fc0dbf00ba5191c6aa7090a19fb9324ca348077","b57189c5f2fd5b3daf3350a77fde90def1080fa5@gmail.com","tests: teach verify_parents to check for extra parents\n\nCurrently verify_parents only makes sure that the earlier parents of\nHEAD match the commits given, and does not care if there are more\nparents.  This makes it harder than one would like to check that, for\nexample, parent reduction works correctly when making an octopus.\n\nFix it by checking that HEAD^(n+1) is not a valid commit name.\nNoticed while working on a new test that was supposed to create a\nfast-forward one commit ahead but actually created a merge.\n\nReported-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jonathan Nieder"],["8c5cea0095ee57c36fddfb9016810c230ce26557","b57189c5f2fd5b3daf3350a77fde90def1080fa5@gmail.com","tests: check git does not barf on merge.ff values for future versions of git\n\nMaybe some day in the future we will want to support a syntax\nlike\n\n\t[merge]\n\t\tff = branch1\n\t\tff = branch2\n\t\tff = branch3\n\nin addition to the currently permitted \"true\", \"false\", and \"only\"\nvalues.  So make sure we continue to treat such configurations as\nthough an unknown variable had been defined rather than erroring out,\nuntil it is time to implement such a thing, so configuration files\nusing such a facility can be shared between present and future git.\n\nWhile at it, add a few missing && and start the \"combining --squash\nand --no-ff\" test with a known state so we can be sure it does not\nsucceed or fail for the wrong reason.\n\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jonathan Nieder"],["ff2e2cd58420438a95257caa6008b885e781d576","a6a1517a087f9f64a72f41a0de57ff01fbb0e412@gmail.com","git-instaweb: Simplify build dependency on gitweb\n\nSince c0cb4ed (git-instaweb: Configure it to work with new gitweb\nstructure, 2010-05-28) git-instaweb does not re-create gitweb.cgi\netc., but makes use of installed gitweb.  Therefore simplify\ngit-instaweb dependency on gitweb subsystem in main Makefile from\n'gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js'\nto simply 'gitweb'.\n\nThis is preparation for splitting gitweb.perl script, and for\nsplitting gitweb.js (to be reassembled / combined on build).  This way\nwe don't have to duplicate parts of gitweb/Makefile in main\nMakefile... it is also more correct description of git-instaweb\ndependency.\n\nReported-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jakub Narebski"],["f09f1d35b5ea0637d8a3733cd246cb6bfb05b22a","a6a1517a087f9f64a72f41a0de57ff01fbb0e412@gmail.com","Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n\nNow that there is gitweb/Makefile, let's leave only \"gitweb\" and\n\"install-gitweb\" targets in main Makefile.  Those targets just\ndelegate to gitweb's Makefile.\n\nRequested-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jakub Narebski"],["3d3a181f8b661f500cbcab476c880dac686cfa8c","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'sr/maint-fast-import-tighten-option-parsing' into jch\n\n* sr/maint-fast-import-tighten-option-parsing:\n  fast-import: fix option parser for no-arg options","Junio C Hamano"],["6910a36607e3269e2014715b7c6f72996c6f9ade","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mk/grep-pcre' into jch\n\n* mk/grep-pcre:\n  grep: Put calls to fixmatch() and regmatch() into patmatch()\n  contrib/completion: --line-number to git grep\n  Documentation: Add --line-number to git-grep synopsis","Junio C Hamano"],["d2ee25b91a50a49630f0c226f3951c8204207b30","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/maint-test-merge-verify-parents' into jch\n\n* jn/maint-test-merge-verify-parents:\n  tests: teach verify_parents to check for extra parents\n  tests: eliminate unnecessary setup test assertions","Junio C Hamano"],["d716b6fffe566260cf2c5c1c6b5c6251a5f3d3c4","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/maint-branch-mergeoptions' into jch\n\n* jc/maint-branch-mergeoptions:\n  merge: make branch.<name>.mergeoptions correctly override merge.<option>\n\nConflicts:\n\tbuiltin/merge.c","Junio C Hamano"],["833d3dd55f6e281505022139009b9ca2968bc976","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mg/merge-ff-config' into jch\n\n* mg/merge-ff-config:\n  tests: check git does not barf on merge.ff values for future versions of git\n  merge: introduce merge.ff configuration variable\n\nConflicts:\n\tt/t7600-merge.sh","Junio C Hamano"],["94a480bd00ea2ff738160869b47677d5676ff911","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/gitweb-dependency' into jch\n\n* jn/gitweb-dependency:\n  Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n  git-instaweb: Simplify build dependency on gitweb","Junio C Hamano"],["0bf9fc0cd28bf8e983a5280676fcaeb826403516","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","t3701: add-p-fix makes the last test to pass\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["865f1ee330b25b55c51503c990aadf819b3c3d73","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/maint-add-p-overlapping-hunks' into jch\n\n* jc/maint-add-p-overlapping-hunks:\n  t3701: add-p-fix makes the last test to pass","Junio C Hamano"]],"repo":"gitster/git","actor":"gitster","ref":"refs/heads/jch","size":16,"head":"865f1ee330b25b55c51503c990aadf819b3c3d73","actor_gravatar":"750680c9dcc7d0be3ca83464a0da49d8","push_id":30841090}