{"head":"9c05eb7763e6e768b31241e66eb26f2f27d201b5","size":67,"push_id":45689832,"shas":[["a8f89bfa999dde7fa801ffc29bc89a1f053849e6","46692b1f0516358b02a6405518c0a52aa8fb3e94@ira.uka.de","completion: unite --reuse-message and --reedit-message for 'notes'\n\nSigned-off-by: SZEDER GÃ¡bor <szeder@ira.uka.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","SZEDER Gábor"],["e67d71e559724eacb6a799f8be42058da52a8580","46692b1f0516358b02a6405518c0a52aa8fb3e94@ira.uka.de","completion: unite --format and --pretty for 'log' and 'show'\n\nSigned-off-by: SZEDER GÃ¡bor <szeder@ira.uka.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","SZEDER Gábor"],["ba959de165c6fc0d08d851894a98778e739aafc9","9d65ae67c3bf4d5605b985e8a180f44b838668ef@gmail.com","git-difftool: allow skipping file by typing 'n' at prompt\n\nThis is useful if you forgot to restrict the diff to the paths you want\nto see, or selecting precisely the ones you want is too much typing.\n\n[jc: with a change to return from the function upon 'n' by Charles Bailey\nand a small tweak in stdin_doesnot_contain() in the test]\n\nSigned-off-by: Sitaram Chamarty <sitaram@atc.tcs.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Sitaram Chamarty"],["dc99b8110a07e3c61e0942dc374f2c2ef17684ed","5c355d1d38066ed0c5de420d67c1b5ed0687c4bd@gmail.com","revert: Free memory after get_message call\n\nThe format_todo function leaks memory because it forgets to call\nfree_message after get_message.  It is a potentially big leak, because\nfresh memory is allocated to store the commit message message for each\ncommit.  Fix this.\n\nReported-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Ramkumar Ramachandra"],["ccaa95c4fccd4ba58a0e4b58b0c3bc74d751b624","5c355d1d38066ed0c5de420d67c1b5ed0687c4bd@gmail.com","revert: Simplify getting commit subject\n\nThe heavy parsing and memory allocations performed by get_message is\nunnecessary when only the commit subject is desired.  Use\nfind_commit_subject instead.\n\nSuggested-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Ramkumar Ramachandra"],["f20db53b5491d5e743eabf192f28c0d4258e9e6e","5c355d1d38066ed0c5de420d67c1b5ed0687c4bd@gmail.com","revert: Fix buffer overflow in insn sheet parser\n\nCheck that the commit name argument to a \"pick\" or \"revert\" action in\n'.git/sequencer/todo' is not too long, to avoid overflowing an\non-stack buffer.  This fixes a regression introduced by 5a5d80f4\n(revert: Introduce --continue to continue the operation, 2011-08-04).\n\nReported-by: Jonathan Nieder <jrnieder@gmail.com>\nAcked-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Ramkumar Ramachandra"],["66b82824c69d40f22530f8a1ca1d86710a4b8b75","5c355d1d38066ed0c5de420d67c1b5ed0687c4bd@gmail.com","revert: Make commit descriptions in insn sheet optional\n\nChange the instruction sheet format subtly so that a description of\nthe commit after the object name is optional.  As a result, an\ninstruction sheet like this is now perfectly valid:\n\n  pick 35b0426\n  pick fbd5bbcbc2e\n  pick 7362160f\n\nSuggested-by: Jonathan Nieder <jrnieder@gmail.com>\nAcked-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Ramkumar Ramachandra"],["82d620bd578dcd5897d072c79af3eb7ad5a967f1","5c355d1d38066ed0c5de420d67c1b5ed0687c4bd@gmail.com","revert: Allow mixed pick and revert instructions\n\nParse the instruction list in '.git/sequencer/todo' as a list of\n(action, operand) pairs, instead of assuming all instructions use the\nsame action.  So now, you can do:\n\n  pick fdc0b12 picked\n  revert 965fed4 anotherpick\n\nFor cherry-pick and revert, this means that a 'git cherry-pick\n--continue' can continue an ongoing revert operation and viceversa.\nThis patch lays the foundation for extending the parser to support\nmore actions so 'git rebase -i' can reuse this machinery in the\nfuture.  While at it, also improve the error messages reported by the\ninsn sheet parser.\n\nHelped-by: Jonathan Nieder <jrnider@gmail.com>\nAcked-by: Jonathan Nieder <jrnider@gmail.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Ramkumar Ramachandra"],["4e5c0b31e95f2e3eed62b15fdd22ee37032abea7","b57189c5f2fd5b3daf3350a77fde90def1080fa5@gmail.com","revert: Simplify passing command-line arguments around\n\nThe chief command-line argument parser, parse_args, currently parses\narguments into an (argc, argv) and lets prepare_revs, a later\nfunction, turn it into a structure.  Change this so that callers of\nthe cherry-pick machinery will have to fill in an options structure\ninstead of crafting command-line arguments.\n\n[rr: minor improvements, commit message]\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jonathan Nieder"],["61dd60a4ccbd62733670246c3d443ee1ab990483","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","fixup! 82d520bd\n\nminor compilation fix; hopefully it will be gone when re-rolled","Junio C Hamano"],["f99f4b3667a83f870565bb140711f0e585999108","5c721353370dda279bee7751cb8d3ff68ef77242@lsrfire.ath.cx","xdiff: factor out get_func_line()\n\nMove the code to search for a function line to be shown in the hunk\nheader into its own function and to make returning the length-limited\nresult string easier, introduce struct func_line.\n\nSigned-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","René Scharfe"],["14937c2c06e63f93f65e1bc6693b95d4e54053d7","5c721353370dda279bee7751cb8d3ff68ef77242@lsrfire.ath.cx","diff: add option to show whole functions as context\n\nAdd the option -W/--function-context to git diff.  It is similar to\nthe same option of git grep and expands the context of change hunks\nso that the whole surrounding function is shown.  This \"natural\"\ncontext can allow changes to be understood better.\n\nNote: GNU patch doesn't like diffs generated with the new option;\nit seems to expect context lines to be the same before and after\nchanges.  git apply doesn't complain.\n\nThis implementation has the same shortcoming as the one in grep,\nnamely that there is no way to explicitly find the end of a\nfunction.  That means that a few lines of extra context are shown,\nright up to the next recognized function begins.  It's already\nuseful in its current form, though.\n\nThe function get_func_line() in xdiff/xemit.c is extended to work\nforward as well as backward to find post-context as well as\npre-context.  It returns the position of the first found matching\nline.  The func_line parameter is made optional, as we don't need\nit for -W.\n\nThe enhanced function is then used in xdl_emit_diff() to extend\nthe context as needed.  If the added context overlaps with the\nnext change, it is merged into the current hunk.\n\nSigned-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","René Scharfe"],["008e3cc5d781273053c79d1ccf8cc3bf36086a07","d4d2cc2a6ec7b2aa587d4887cc5ed200f9b685a1@imag.fr","config: display key_delim for config --bool --get-regexp\n\nThe previous logic in show_config was to print the delimiter when the\nvalue was set, but Boolean variables have an implicit value \"true\" when\nthey appear with no value in the config file. As a result, we got:\n\ngit_Config        --get-regexp '.*\\.Boolean'\t#1. Ok: example.boolean\ngit_Config --bool --get-regexp '.*\\.Boolean'\t#2. NO: example.booleantrue\n\nFix this by defering the display of the separator until after the value\nto display has been computed.\n\nReported-by: Brian Foster <brian.foster@maxim-ic.com>\nSigned-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Matthieu Moy"],["0f6adfe2a26287c5c13366975f621c818bb3214d","eccf10a4397cf08f0034a6cb5e4457bdd5e3783e@gmail.com","Teach merge the '[-e|--edit]' option\n\nImplemented internally instead of as \"git merge --no-commit && git commit\"\nso that \"merge --edit\" is otherwise consistent (hooks, etc) with \"merge\".\n\nNote: the edit message does not include the status information that one\ngets with \"commit --status\" and it is cleaned up after editing like one\ngets with \"commit --cleanup=default\". A later patch could add the status\ninformation if desired.\n\nNote: previously we were not calling stripspace() after running the\nprepare-commit-msg hook. Now we are, stripping comments and\nleading/trailing whitespace lines if --edit is given, otherwise only\nstripping leading/trailing whitespace lines if not given --edit.\n\nSigned-off-by: Jay Soffian <jaysoffian@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Jay Soffian"],["92cde9447cdb4e4b178c80453a338b9915a05049","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","fixup! 0f6adfe2a26287c5c13366975f621c818bb3214d","Junio C Hamano"],["3bc3b6ba62373a5ac217f4c5b2659925b9ffc335","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'sp/smart-http-failure' into jch\n\n* sp/smart-http-failure:\n  remote-curl: Fix warning after HTTP failure","Junio C Hamano"],["1a2d2c2b0595d28c8876cdfb5db5873030f24353","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'js/bisect-no-checkout' into jch\n\n* js/bisect-no-checkout:\n  bisect: fix exiting when checkout failed in bisect_start()","Junio C Hamano"],["7df901dedbd60afeb35519cd7cebe0a000fc3785","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'bw/grep-no-index-no-exclude' into jch\n\n* bw/grep-no-index-no-exclude:\n  grep --no-index: don't use git standard exclusions\n  grep: do not use --index in the short usage output","Junio C Hamano"],["3229c2cbc9be038da6b599e77abd2320389ab76f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'nd/maint-sparse-errors' into jch\n\n* nd/maint-sparse-errors:\n  Add explanation why we do not allow to sparse checkout to empty working tree\n  sparse checkout: show error messages when worktree shaping fails","Junio C Hamano"],["bb66555ae8b31565a04d566014671fd41e44fc95","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'nd/maint-autofix-tag-in-head' into jch\n\n* nd/maint-autofix-tag-in-head:\n  Accept tags in HEAD or MERGE_HEAD\n  merge: remove global variable head[]\n  merge: use return value of resolve_ref() to determine if HEAD is invalid\n  merge: keep stash[] a local variable\n\nConflicts:\n\tbuiltin/merge.c","Junio C Hamano"]],"ref":"refs/heads/pu"}