{"head":"703f05ad5835cff92b12c29aecf8d724c8c847e2","size":15,"push_id":44901108,"shas":[["40ffc49876611150104102d59a35d865e4670bd7","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'gb/maint-am-patch-format-error-message' into maint\n\n* gb/maint-am-patch-format-error-message:\n  am: format is in $patch_format, not parse_patch","Junio C Hamano"],["503359f13abc251ecbcd6a135918efbc58a4e6f6","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mg/branch-set-upstream-previous' into maint\n\n* mg/branch-set-upstream-previous:\n  branch.c: use the parsed branch name","Junio C Hamano"],["be5acb3b63af077db05788235a1d845d511e4561","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'mh/check-ref-format-print-normalize' into maint\n\n* mh/check-ref-format-print-normalize:\n  Forbid DEL characters in reference names\n  check-ref-format --print: Normalize refnames that start with slashes","Junio C Hamano"],["406c1c4dd4a8f0fac3fddce1e7bb3b66af835e6a","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'nd/maint-clone-gitdir' into maint\n\n* nd/maint-clone-gitdir:\n  clone: allow to clone from .git file\n  read_gitfile_gently(): rename misnamed function to read_gitfile()","Junio C Hamano"],["84b051462fcaf9892f31f178a47c261ddd5c9695","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/maint-clone-alternates' into maint\n\n* jc/maint-clone-alternates:\n  clone: clone from a repository with relative alternates\n  clone: allow more than one --reference","Junio C Hamano"],["85b3c75f4fd3aa4da976bac702827dc8d7d1bf15","a8ac599518c4917f802b4b8368f5d9f3d5ed5f41@gmail.com","describe: Refresh the index when run with --dirty\n\nWhen running git describe --dirty the index should be refreshed.  Previously\nthe cached index would cause describe to think that the index was dirty when,\nin reality, it was just stale.\n\nThe issue was exposed by python setuptools which hardlinks files into another\ndirectory when building a distribution.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Allan Caffee"],["a0b1cb60ab296476084b3d4766a943e2d62719b8","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cb/maint-ls-files-error-report' into maint\n\n* cb/maint-ls-files-error-report:\n  t3005: do not assume a particular order of stdout and stderr of git-ls-files\n  ls-files: fix pathspec display on error","Junio C Hamano"],["632052641517de1a965c1f045b97d2eaa541b2e9","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Git 1.7.6.4\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["d45b7f40b30833b0fff87a734044f465a26f40c9","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","merge-recursive: Do not look at working tree during a virtual ancestor merge\n\nFix another instance of a recursive merge incorrectly paying attention to\nthe working tree file during a virtual ancestor merge, that resulted in\nspurious and useless \"addinfo_cache failed\" error message.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["b7619006ebd9c9760b34bb38e04ce4dc8c606483","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge 1.7.6.4 in\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["85e9c7e1d42849c5c3084a9da748608468310c0e","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Git 1.7.7-rc3\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["180619a58572b17de0ebeb96989e0aa832765186","759412786bc533369b22377bf83fb9056c5b25b2@herland.net","notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond\n\nThe combine_notes_fn functions uses a non-zero return value to indicate\nfailure. However, this return value was converted to a call to die()\nin note_tree_insert().\n\nInstead, propagate this return value out to add_note(), and return it\nfrom there to enable the caller to handle errors appropriately.\n\nExisting add_note() callers are updated to die() upon failure, thus\npreserving the current behaviour. The only exceptions are copy_note()\nand notes_cache_put() where we are able to propagate the add_note()\nreturn value instead.\n\nThis patch has been improved by the following contributions:\n- Jonathan Nieder: Future-proof by always checking add_note() return value\n- Jonathan Nieder: Improve clarity of final if-condition in note_tree_insert()\n\nThanks-to: Jonathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Johan Herland <johan@herland.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johan Herland"],["f946b465d7fa13a235dd5653d37c7babb1ceb233","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jk/color-and-pager'\n\n* jk/color-and-pager:\n  want_color: automatically fallback to color.ui\n  diff: don't load color config in plumbing\n  config: refactor get_colorbool function\n  color: delay auto-color decision until point of use\n  git_config_colorbool: refactor stdout_is_tty handling\n  diff: refactor COLOR_DIFF from a flag into an int\n  setup_pager: set GIT_PAGER_IN_USE\n  t7006: use test_config helpers\n  test-lib: add helper functions for config\n  t7006: modernize calls to unset\n\nConflicts:\n\tbuiltin/commit.c\n\tparse-options.c","Junio C Hamano"],["1a7b1f6b9c9a129236c66c392877e8697825470f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","sha1-lookup: fix up the assertion message\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Junio C Hamano"],["3793a309018eac83de7e4a3d39440d236660665c","781f23e367a7ada1fde54f9860fdd95ca652794e@gmail.com","url: add str wrapper for end_url_with_slash()\n\nHelped-by: Johnathan Nieder <jrnieder@gmail.com>\nSigned-off-by: Tay Ray Chuan <rctay89@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Tay Ray Chuan"]],"ref":"refs/heads/master"}