summaryrefslogtreecommitdiff
path: root/dir.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-0/+1
|\
| * object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | Merge branch 'jk/ewah-bounds-check'Junio C Hamano2018-06-181-1/+2
|\ \
| * | ewah: adjust callers of ewah_read_mmap()Jeff King2018-06-181-1/+2
* | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-12/+13
|\ \ \
| * | | dir: use the_hash_algo for empty blob object IDbrian m. carlson2018-05-021-1/+1
| * | | dir: convert struct untracked_cache_dir to object_idbrian m. carlson2018-05-021-11/+12
| | |/ | |/|
* | | Sync with Git 2.17.1Junio C Hamano2018-05-291-1/+1
|\ \ \
| * \ \ Sync with Git 2.16.4Junio C Hamano2018-05-221-1/+1
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'sb/submodule-move-nested'Junio C Hamano2018-05-081-3/+57
|\ \ \ \ | |_|_|/ |/| | |
| * | | submodule: fixup nested submodules after moving the submodulesb/submodule-move-nestedStefan Beller2018-03-291-3/+57
* | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
| |/ / |/| |
* | | Merge branch 'bp/untracked-cache-noflush'Junio C Hamano2018-03-081-2/+13
|\ \ \
| * | | untracked cache: use git_env_bool() not getenv() for customizationbp/untracked-cache-noflushJunio C Hamano2018-02-281-2/+12
| * | | dir.c: don't flag the index as dirty for changes to the untracked cacheBen Peart2018-02-051-1/+2
| | |/ | |/|
* | | Merge branch 'nd/fix-untracked-cache-invalidation'Junio C Hamano2018-02-271-14/+27
|\ \ \
| * | | dir.c: ignore paths containing .git when invalidating untracked cachend/fix-untracked-cache-invalidationNguyễn Thái Ngọc Duy2018-02-071-4/+6
| * | | dir.c: stop ignoring opendir() error in open_cached_dir()Nguyễn Thái Ngọc Duy2018-02-021-1/+6
| * | | dir.c: fix missing dir invalidation in untracked codeNguyễn Thái Ngọc Duy2018-01-241-8/+14
| * | | dir.c: avoid stat() in valid_cached_dir()Nguyễn Thái Ngọc Duy2018-01-241-1/+1
* | | | Merge branch 'nd/trace-index-ops'Junio C Hamano2018-02-151-0/+2
|\ \ \ \
| * | | | trace: measure where the time is spent in the index-heavy operationsnd/trace-index-opsNguyễn Thái Ngọc Duy2018-02-021-0/+2
| | |/ / | |/| |
* | | | Merge branch 'po/object-id'Junio C Hamano2018-02-151-54/+50
|\ \ \ \ | |_|_|/ |/| | |
| * | | sha1_file: convert hash_sha1_file to object_idPatryk Obara2018-01-301-2/+2
| * | | dir: convert struct sha1_stat to use object_idPatryk Obara2018-01-301-54/+50
| |/ /
* | | Use MOVE_ARRAYsg/cocci-move-arraySZEDER Gábor2018-01-221-2/+2
|/ /
* | Merge branch 'jh/object-filtering'Junio C Hamano2017-12-271-31/+101
|\ \ | |/ |/|
| * dir: allow exclusions from blob in addition to fileJeff Hostetler2017-11-221-31/+101
* | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-10/+17
|\ \
| * | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-10/+17
| * | Merge branch 'rs/stat-data-unaligned-reads-fix'Junio C Hamano2017-08-111-23/+27
| |\ \
* | \ \ Merge branch 'jm/status-ignored-files-list'Junio C Hamano2017-11-131-2/+42
|\ \ \ \
| * | | | status: report matching ignored and normal untrackedJameson Miller2017-10-311-2/+18
| * | | | status: add option to show ignored files differentlyJameson Miller2017-10-311-0/+24
| | |_|/ | |/| |
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-4/+4
|\ \ \ \
| * | | | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-2/+2
| * | | | Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson2017-10-161-4/+4
| |/ / /
* | | | Merge branch 'js/submodule-in-excluded'Junio C Hamano2017-11-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excludedJohannes Schindelin2017-10-261-1/+1
| * | | Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-131-4/+39
| |\ \ \
* | | | | Improve performance of git status --ignoredjm/status-ignored-directory-optimJameson Miller2017-09-191-6/+41
* | | | | Merge branch 'rs/stat-data-unaligned-reads-fix' into maintJunio C Hamano2017-08-231-23/+27
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | dir: support platforms that require aligned readsrs/stat-data-unaligned-reads-fixRené Scharfe2017-07-171-23/+27
* | | | Merge branch 'ab/wildmatch'Junio C Hamano2017-07-101-5/+3
|\ \ \ \
| * | | | wildmatch: remove unused wildopts parameterab/wildmatchÆvar Arnfjörð Bjarmason2017-06-231-5/+3
* | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-6/+3
|\ \ \ \ \
| * | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-6/+3
* | | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ \ \ \
| * | | | | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |