summaryrefslogtreecommitdiff
path: root/diff-lib.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-9/+12
|\
| * revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
| * diff-lib.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-7/+10
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-2/+2
|\ \
| * | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-1/+1
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
| |/
* | Merge branch 'nd/unpack-trees-with-cache-tree'Junio C Hamano2018-09-171-2/+2
|\ \ | |/ |/|
| * trace.h: support nested performance tracingNguyễn Thái Ngọc Duy2018-08-181-2/+2
* | dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-2/+2
|/
* Merge branch 'jk/has-uncommitted-changes-fix'Junio C Hamano2018-08-021-0/+3
|\
| * has_uncommitted_changes(): fall back to empty treeJeff King2018-07-111-0/+3
* | diff: ignore --ita-[in]visible-in-index when diffing worktree-to-treeNguyễn Thái Ngọc Duy2018-05-291-2/+6
* | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-19/+19
|\ \
| * | diff-lib: rename 'new' variableBrandon Williams2018-02-221-19/+19
| |/
* | trace: measure where the time is spent in the index-heavy operationsnd/trace-index-opsNguyễn Thái Ngọc Duy2018-02-021-0/+4
|/
* Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-1/+1
|\
| * Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-0/+2
|\ \ | |/ |/|
| * fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-0/+2
* | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-14/+16
|\ \
| * | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-11/+11
| * | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-2/+2
| * | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-9/+10
| * | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-011-3/+4
* | | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-1/+1
* | | Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson2017-10-161-2/+2
|/ /
* | object_array: use `object_array_clear()`, not `free()`Martin Ågren2017-09-241-2/+1
|/
* Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\
| * coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-26/+26
|\ \ | |/ |/|
| * diff: convert fill_filespec to struct object_idBrandon Williams2017-06-021-1/+1
| * diff: convert diff_change to struct object_idBrandon Williams2017-06-021-2/+2
| * diff: convert run_diff_files to struct object_idBrandon Williams2017-06-021-6/+6
| * diff: convert diff_addremove to struct object_idBrandon Williams2017-06-021-3/+3
| * diff: convert diff_index_show_file to struct object_idBrandon Williams2017-06-021-5/+5
| * diff: convert get_stat_data to struct object_idBrandon Williams2017-06-021-13/+13
* | Merge branch 'jc/noent-notdir'Junio C Hamano2017-06-131-1/+1
|\ \ | |/ |/|
| * treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedjc/noent-notdirJunio C Hamano2017-05-301-1/+1
* | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-1/+1
* | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-081-6/+6
|/
* commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-241-1/+3
* diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-241-0/+14
* cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-13/+18
* Remove get_object_hash.brian m. carlson2015-11-201-1/+1
* Add several uses of get_object_hash.brian m. carlson2015-11-201-1/+1
* Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-251-12/+0
|\
| * Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-231-12/+0
* | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-05-191-0/+12
|\ \ | |/
| * diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-231-0/+12
* | Merge branch 'bc/object-id'Junio C Hamano2015-05-051-5/+5
|\ \ | |/ |/|