summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* push: disable lazy --force-with-lease by defaultjc/allow-lazy-casJunio C Hamano2017-07-069-5/+56
* Fourteenth batch for 2.14Junio C Hamano2017-07-051-0/+12
* Merge branch 'jt/unify-object-info'Junio C Hamano2017-07-055-217/+224
|\
| * sha1_file: refactor has_sha1_file_with_flagsjt/unify-object-infoJonathan Tan2017-06-264-23/+13
| * sha1_file: do not access pack if unneededJonathan Tan2017-06-261-0/+11
| * sha1_file: teach sha1_object_info_extended more flagsJonathan Tan2017-06-262-19/+28
| * sha1_file: refactor read_objectJonathan Tan2017-06-212-42/+43
| * sha1_file: move delta base cache code upJonathan Tan2017-06-211-110/+110
| * sha1_file: rename LOOKUP_REPLACE_OBJECTJonathan Tan2017-06-213-18/+18
| * sha1_file: rename LOOKUP_UNKNOWN_OBJECTJonathan Tan2017-06-213-4/+5
| * sha1_file: teach packed_object_info about typenameJonathan Tan2017-06-151-17/+12
* | Merge branch 'cc/shared-index-permfix'Junio C Hamano2017-07-054-11/+50
|\ \
| * | t1700: make sure split-index respects core.sharedrepositorycc/shared-index-permfixChristian Couder2017-06-251-0/+30
| * | t1301: move modebits() to test-lib-functions.shChristian Couder2017-06-252-11/+12
| * | read-cache: use shared perms when writing shared indexChristian Couder2017-06-251-0/+8
* | | Merge branch 'rs/sha1-name-readdir-optim'Junio C Hamano2017-07-057-39/+90
|\ \ \
| * | | sha1_file: guard against invalid loose subdirectory numbersrs/sha1-name-readdir-optimRené Scharfe2017-06-245-6/+9
| * | | sha1_file: let for_each_file_in_obj_subdir() handle subdir namesRené Scharfe2017-06-242-9/+14
| * | | p4205: add perf test script for pretty log formatsRené Scharfe2017-06-241-0/+16
| * | | sha1_name: cache readdir(3) results in find_short_object_filename()René Scharfe2017-06-223-26/+53
| |/ /
* | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-0520-373/+972
|\ \ \
| * | | ls-files: use repository objectbw/repo-objectBrandon Williams2017-06-233-115/+118
| * | | repository: enable initialization of submodulesBrandon Williams2017-06-232-0/+64
| * | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-234-18/+16
| * | | submodule: add repo_read_gitmodulesBrandon Williams2017-06-232-0/+17
| * | | submodule-config: store the_submodule_cache in the_repositoryBrandon Williams2017-06-234-18/+72
| * | | repository: add index_state to struct repoBrandon Williams2017-06-232-0/+25
| * | | config: read config from a repository objectBrandon Williams2017-06-234-74/+183
| * | | path: add repo_worktree_path and strbuf_repo_worktree_pathBrandon Williams2017-06-232-0/+49
| * | | path: add repo_git_path and strbuf_repo_git_pathBrandon Williams2017-06-232-0/+29
| * | | path: worktree_git_path() should not use file relocationBrandon Williams2017-06-231-1/+2
| * | | path: convert do_git_path to take a 'struct repository'Brandon Williams2017-06-231-14/+28
| * | | path: convert strbuf_git_common_path to take a 'struct repository'Brandon Williams2017-06-233-8/+16
| * | | path: always pass in commondir to update_common_dirBrandon Williams2017-06-231-3/+1
| * | | path: create path.hBrandon Williams2017-06-233-58/+64
| * | | environment: store worktree in the_repositoryBrandon Williams2017-06-231-5/+4
| * | | environment: place key repository state in the_repositoryBrandon Williams2017-06-234-53/+34
| * | | repository: introduce the repository objectBrandon Williams2017-06-233-0/+224
| * | | environment: remove namespace_len variableBrandon Williams2017-06-231-5/+4
| * | | setup: add comment indicating a hackBrandon Williams2017-06-231-0/+6
| * | | setup: don't perform lazy initialization of repository stateBrandon Williams2017-06-233-9/+24
| | | |
| | \ \
| *-. \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-23155-413/+614
| |\ \ \ \
* | | | | | Thirteenth batch for 2.14Junio C Hamano2017-06-301-0/+23
* | | | | | Merge branch 'vs/typofixes'Junio C Hamano2017-06-3028-41/+41
|\ \ \ \ \ \
| * | | | | | Spelling fixesvs/typofixesVille Skyttä2017-06-2728-41/+41
* | | | | | | Merge branch 'rs/apply-validate-input'Junio C Hamano2017-06-304-7/+86
|\ \ \ \ \ \ \
| * | | | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-inputRené Scharfe2017-06-272-0/+33
| * | | | | | | apply: check git diffs for invalid file modesRené Scharfe2017-06-272-6/+27
| * | | | | | | apply: check git diffs for missing old filenamesRené Scharfe2017-06-272-1/+26
* | | | | | | | Merge branch 'jc/pack-bitmap-unaligned'Junio C Hamano2017-06-301-1/+1
|\ \ \ \ \ \ \ \