{"shas":[["7569c1f444b38b9f34366302b4a61b7fd80fed00","fd432345609ae4d58c1aa629cb66ba96d1391622@kdbg.org","t7300: add a missing SYMLINKS prerequisite\n\nThe test fails on Windows since 2dec68c (tests: add missing &&, batch 2).\n\nEven though this test allocates and leaves behind files, subsequent tests\ndo not depend on this, so it is safe to just skip it.\n\nSigned-off-by: Johannes Sixt <j6t@kdbg.org>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","Johannes Sixt"],["3fe9db3fef5434ca91e676b8f700d60e0b759496","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'en/and-cascade-tests'\n\n* en/and-cascade-tests:\n  t7300: add a missing SYMLINKS prerequisite","Junio C Hamano"],["feedaf43dbf31b18d96c4116e3b3f0c522b2cd7b","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'tc/smart-http-post-redirect'\n\n* tc/smart-http-post-redirect:\n  smart-http: Don't change POST to GET when following redirect","Junio C Hamano"],["f565f6e06511249c8c3690277023a8550dbdfb47","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'ak/apply-non-git-epoch'\n\n* ak/apply-non-git-epoch:\n  apply: handle patches with funny filename and colon in timezone\n  apply: Recognize epoch timestamps with : in the timezone","Junio C Hamano"],["039e84e30d38f51d68ab465bfae32ba8058b51a0","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cm/diff-check-at-eol'\n\n* cm/diff-check-at-eol:\n  diff --check: correct line numbers of new blank lines at EOF","Junio C Hamano"],["4ef927a995d9b54b37e4cff8ed7cd92764d4dacd","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'kb/blame-author-email'\n\n* kb/blame-author-email:\n  blame: Add option to show author email instead of name\n\nConflicts:\n\tt/annotate-tests.sh","Junio C Hamano"],["e4663556cfa0d85e7a80d731b07d4058335761ff","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'rr/needs-clean-work-tree'\n\n* rr/needs-clean-work-tree:\n  Porcelain scripts: Rewrite cryptic \"needs update\" error message","Junio C Hamano"],["ed8298dc34234a55fc0e90e5ae284ae5f572a436","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/fast-import-fix'\n\n* jn/fast-import-fix:\n  fast-import: do not clear notes in do_change_note_fanout()\n  t9300 (fast-import): another test for the \"replace root\" feature\n  fast-import: tighten M 040000 syntax\n  fast-import: filemodify after M 040000 <tree> \"\" crashes","Junio C Hamano"],["f3f973a0176d5fe7870ca4f27085d347b96307d2","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'fc/apply-p2-get-header-name'\n\n* fc/apply-p2-get-header-name:\n  test: git-apply -p2 rename/chmod only\n  Fix git-apply with -p greater than 1","Junio C Hamano"],["f5a5531e4e08c22ff1c3f02c43954896b947b158","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'np/diff-in-corrupt-repository'\n\n* np/diff-in-corrupt-repository:\n  diff: don't presume empty file when corresponding object is missing","Junio C Hamano"],["09efc4510dd11b559404d200286ae988fa66c88f","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'np/pack-broken-boundary'\n\n* np/pack-broken-boundary:\n  make pack-objects a bit more resilient to repo corruption","Junio C Hamano"],["1aa6583cc257f3b0570cbc25c89a54f0e4417ef6","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jl/add-p-reverse-message'\n\n* jl/add-p-reverse-message:\n  Correct help blurb in checkout -p and friends","Junio C Hamano"],["ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'md/interix'\n\n* md/interix:\n  Interix: add configure checks\n  add support for the SUA layer (interix; windows)\n\nConflicts:\n\tgit-compat-util.h","Junio C Hamano"],["d7f4809bc5ceaef14420be57aecbdf8280fac81c","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jc/emfile'\n\n* jc/emfile:\n  A loose object is not corrupt if it cannot be read due to EMFILE\n  read_sha1_file(): report correct name of packfile with a corrupt object","Junio C Hamano"],["5eee142c89ee4964c9ea4ae1b2fa8344036a7efb","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jn/cherry-pick-refresh-index'\n\n* jn/cherry-pick-refresh-index:\n  cherry-pick/revert: transparently refresh index","Junio C Hamano"],["106e3afa6f2d54ea520f9f156abca34913ae4968","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'jl/clone-recurse-sm-synonym'\n\n* jl/clone-recurse-sm-synonym:\n  clone: Add the --recurse-submodules option as alias for --recursive","Junio C Hamano"],["5acb623b72bde9ec96c48a8bb8f50e61371705ee","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'en/merge-recursive'\n\n* en/merge-recursive: (41 commits)\n  t6022: Use -eq not = to test output of wc -l\n  merge-recursive:make_room_for_directories - work around dumb compilers\n  merge-recursive: Remove redundant path clearing for D/F conflicts\n  merge-recursive: Make room for directories in D/F conflicts\n  handle_delete_modify(): Check whether D/F conflicts are still present\n  merge_content(): Check whether D/F conflicts are still present\n  conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts\n  conflict_rename_delete(): Check whether D/F conflicts are still present\n  merge-recursive: Delay modify/delete conflicts if D/F conflict present\n  merge-recursive: Delay content merging for renames\n  merge-recursive: Delay handling of rename/delete conflicts\n  merge-recursive: Move handling of double rename of one file to other file\n  merge-recursive: Move handling of double rename of one file to two\n  merge-recursive: Avoid doubly merging rename/add conflict contents\n  merge-recursive: Update merge_content() call signature\n  merge-recursive: Update conflict_rename_rename_1to2() call signature\n  merge-recursive: Structure process_df_entry() to handle more cases\n  merge-recursive: Have process_entry() skip D/F or rename entries\n  merge-recursive: New function to assist resolving renames in-core only\n  merge-recursive: New data structures for deferring of D/F conflicts\n  ...\n\nConflicts:\n\tt/t6020-merge-df.sh\n\tt/t6036-recursive-corner-cases.sh","Junio C Hamano"],["208247adb9fc3702f87c6ec3fc26bd85d10d73e6","a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","Merge branch 'cb/leading-path-removal'\n\n* cb/leading-path-removal:\n  use persistent memory for rejected paths\n  do not overwrite files in leading path\n  lstat_cache: optionally return match_len\n  add function check_ok_to_remove()\n  t7607: add leading-path tests\n  t7607: use test-lib functions and check MERGE_HEAD\n\nConflicts:\n\tt/t7607-merge-overwrite.sh","Junio C Hamano"]],"ref":"refs/heads/master","push_id":20757158,"head":"208247adb9fc3702f87c6ec3fc26bd85d10d73e6","size":18}