aboutsummaryrefslogtreecommitdiffstats
path: root/diff-lib.c
AgeCommit message (Expand)AuthorFilesLines
2024-04-03revision: optionally record matches with pathspec elementsJunio C Hamano1-1/+10
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-1/+1
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-2/+3
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-1/+0
2023-12-27Merge branch 'jc/diff-cached-fsmonitor-fix'Junio C Hamano1-1/+7
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-10-13Merge branch 'ar/diff-index-merge-base-fix'Junio C Hamano1-2/+0
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-1/+1
2023-10-02diff: fix --merge-base with annotated tagsAlyssa Ross1-2/+0
2023-09-20Merge branch 'js/diff-cached-fsmonitor-fix'Junio C Hamano1-6/+6
2023-09-15diff-lib: fix check_removed() when fsmonitor is activeJunio C Hamano1-1/+7
2023-09-15Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fixJunio C Hamano1-6/+6
2023-09-11diff-lib: fix check_removed when fsmonitor is onJosip Sokcevic1-6/+6
2023-08-21diff: drop useless return from run_diff_{files,index} functionsJeff King1-4/+2
2023-08-21diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()Junio C Hamano1-1/+1
2023-06-29Merge branch 'en/header-split-cache-h-part-3'Junio C Hamano1-1/+4
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren1-0/+2
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-14diff-lib: honor override_submodule_config flag bitJosip Sokcevic1-1/+8
2023-04-24symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on trace.h & trace2.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-1/+1
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2022-12-13diff: mark unused parameters in callbacksJeff King1-1/+1
2022-08-08oneway_diff: handle removed sparse directoriesVictoria Dye1-0/+5
2022-04-13revisions API: add a TODO for diff_free(&revs->diffopt)Ævar Arnfjörð Bjarmason1-1/+3
2022-04-13revisions API: have release_revisions() release "prune_data"Ævar Arnfjörð Bjarmason1-1/+0
2022-04-13revisions API users: use release_revisions() for "prune_data" usersÆvar Arnfjörð Bjarmason1-0/+1
2022-04-13revision.[ch]: provide and start using a release_revisions()Ævar Arnfjörð Bjarmason1-1/+1
2021-09-08Merge branch 'dd/diff-files-unmerged-fix'Junio C Hamano1-0/+4
2021-08-25diff-lib: ignore paths that are outside $cwd if --relative askedĐoàn Trần Công Danh1-0/+4
2021-07-14diff-lib: handle index diffs with sparse dirsDerrick Stolee1-0/+19
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-3/+3
2021-03-18fsmonitor: add assertion that fsmonitor is valid to check_removedNipunn Koorapati1-7/+11
2021-03-18fsmonitor: skip lstat deletion check during git diff-indexNipunn Koorapati1-1/+4
2020-11-25Merge branch 'rs/plug-diff-cache-leak'Junio C Hamano1-0/+2
2020-11-16diff-lib: plug minor memory leaks in do_diff_cache()René Scharfe1-0/+2
2020-11-09Merge branch 'nk/diff-files-vs-fsmonitor'Junio C Hamano1-2/+13
2020-11-02Merge branch 'dl/diff-merge-base'Junio C Hamano1-2/+61
2020-10-20fsmonitor: use fsmonitor data in `git diff`Alex Vandiver1-2/+13
2020-10-05Merge branch 'so/combine-diff-simplify'Junio C Hamano1-4/+2
2020-09-29diff: get rid of redundant 'dense' argumentSergey Organov1-4/+2
2020-09-22Merge branch 'es/format-patch-interdiff-cleanup'Junio C Hamano1-0/+25
2020-09-20builtin/diff-index: learn --merge-baseDenton Liu1-1/+14
2020-09-20diff-lib: define diff_get_merge_base()Denton Liu1-0/+45
2020-09-20diff-lib: accept option flags in run_diff_index()Denton Liu1-1/+2
2020-09-08diff-lib: tighten show_interdiff()'s interfaceEric Sunshine1-3/+4
2020-09-08diff: move show_interdiff() from its own file to diff-libEric Sunshine1-0/+24
2020-08-31revision: add separate field for "-m" of "diff-index -m"Sergey Organov1-8/+2
2020-08-09diff-lib: use worktree mode in diffs from i-t-a entriesRaymond E. Pasco1-1/+2
2020-07-01diff-files --raw: show correct post-image of intent-to-add filesJohannes Schindelin1-2/+1
2019-05-28mark_fsmonitor_valid(): mark the index as changed if neededJohannes Schindelin1-1/+1
2019-02-14diff: drop options parameter from diffcore_fix_diff_index()Jeff King1-1/+1
2018-11-12diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-3/+4
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-9/+12
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2018-09-21diff-lib.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-7/+10
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-2/+2
2018-09-17Merge branch 'nd/unpack-trees-with-cache-tree'Junio C Hamano1-2/+2
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-08-18trace.h: support nested performance tracingNguyễn Thái Ngọc Duy1-2/+2
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-2/+2
2018-08-02Merge branch 'jk/has-uncommitted-changes-fix'Junio C Hamano1-0/+3
2018-07-11has_uncommitted_changes(): fall back to empty treeJeff King1-0/+3
2018-05-29diff: ignore --ita-[in]visible-in-index when diffing worktree-to-treeNguyễn Thái Ngọc Duy1-2/+6
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano1-19/+19
2018-02-22diff-lib: rename 'new' variableBrandon Williams1-19/+19
2018-02-02trace: measure where the time is spent in the index-heavy operationsNguyễn Thái Ngọc Duy1-0/+4
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-11-21Merge branch 'bp/fsmonitor'Junio C Hamano1-0/+2
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-14/+16
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-11/+11
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-2/+2
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams1-9/+10
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams1-3/+4
2017-10-16refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson1-1/+1
2017-10-16Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson1-2/+2
2017-10-01fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart1-0/+2
2017-09-24object_array: use `object_array_clear()`, not `free()`Martin Ågren1-2/+1
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-2/+1
2017-06-19Merge branch 'bw/object-id'Junio C Hamano1-26/+26
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason1-2/+1
2017-06-13Merge branch 'jc/noent-notdir'Junio C Hamano1-1/+1
2017-06-02diff: convert fill_filespec to struct object_idBrandon Williams1-1/+1
2017-06-02diff: convert diff_change to struct object_idBrandon Williams1-2/+2
2017-06-02diff: convert run_diff_files to struct object_idBrandon Williams1-6/+6
2017-06-02diff: convert diff_addremove to struct object_idBrandon Williams1-3/+3
2017-06-02diff: convert diff_index_show_file to struct object_idBrandon Williams1-5/+5
2017-06-02diff: convert get_stat_data to struct object_idBrandon Williams1-13/+13
2017-05-30treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedJunio C Hamano1-1/+1
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson1-1/+1
2017-05-08diff-lib: convert do_diff_cache to struct object_idbrian m. carlson1-6/+6
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy1-1/+3
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy1-0/+14
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson1-13/+18
2015-11-20Remove get_object_hash.brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.brian m. carlson1-1/+1
2015-06-25Merge branch 'nd/diff-i-t-a'Junio C Hamano1-12/+0
2015-06-23Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano1-12/+0
2015-05-19Merge branch 'nd/diff-i-t-a'Junio C Hamano1-0/+12
2015-05-05Merge branch 'bc/object-id'Junio C Hamano1-5/+5
2015-03-23diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy1-0/+12
2015-03-13diff: convert struct combine_diff_path to object_idbrian m. carlson1-5/+5
2015-02-04run_diff_files(): clarify computation of sha1 validityJunio C Hamano1-2/+6
2014-06-16Merge branch 'jk/diff-files-assume-unchanged'Junio C Hamano1-12/+21
2014-05-15run_diff_files: do not look at uninitialized stat dataJeff King1-12/+21
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano1-3/+0
2014-03-05Merge branch 'ks/combine-diff'Junio C Hamano1-2/+0
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov1-2/+0
2014-02-24pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy1-2/+3
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-2/+1
2013-09-09Merge branch 'jc/diff-filter-negation'Junio C Hamano1-5/+3
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano1-3/+0
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano1-5/+3
2013-07-15remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy1-1/+1
2013-07-15parse_pathspec: add special flag for max_depth featureNguyễn Thái Ngọc Duy1-1/+0
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe1-1/+2
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe1-11/+12
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-8/+12
2012-01-16diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy1-0/+2
2011-10-05Merge branch 'cn/eradicate-working-copy'Junio C Hamano1-1/+1
2011-10-05Merge branch 'jc/diff-index-unpack'Junio C Hamano1-0/+1
2011-09-21Remove 'working copy' from the documentation and C codeCarlos Martín Nieto1-1/+1
2011-08-29diff-index: pass pathspec down to unpack-trees machineryJunio C Hamano1-0/+1
2011-08-08Merge branch 'jc/diff-index-refactor'Junio C Hamano1-52/+19
2011-08-01Merge branch 'jc/maint-reset-unmerged-path'Junio C Hamano1-1/+2
2011-07-13diff-lib: refactor run_diff_index() and do_diff_cache()Junio C Hamano1-28/+19
2011-07-13diff-lib: simplify do_diff_cache()Junio C Hamano1-25/+1
2011-07-13reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano1-1/+2
2011-06-06Merge branch 'jk/diff-not-so-quick'Junio C Hamano1-3/+1
2011-05-31diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano1-1/+6
2011-05-31Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-earlyJunio C Hamano1-63/+78
2011-05-31diff: futureproof "stop feeding the backend early" logicJunio C Hamano1-3/+1
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano1-4/+11
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano1-4/+11
2011-04-23diff-files: show unmerged entries correctlyJunio C Hamano1-2/+8
2011-04-23diff: remove often unused parameters from diff_unmerge()Junio C Hamano1-3/+4
2011-03-23Merge branch 'jc/maint-diff-q-filter'Junio C Hamano1-1/+2
2011-03-16diff --quiet: disable optimization when --diff-filter=X is usedJunio C Hamano1-1/+2
2011-02-03Convert ce_path_match() to use struct pathspecNguyễn Thái Ngọc Duy1-2/+2
2011-02-03struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy1-3/+3
2011-02-03Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy1-1/+1
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann1-5/+10
2010-06-11Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann1-0/+1
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano1-18/+27
2010-03-13git status: ignoring untracked files must apply to submodules tooJens Lehmann1-1/+1
2010-03-12git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann1-4/+2
2010-03-12Refactor dirty submodule detection in diff-lib.cJens Lehmann1-18/+27
2010-03-09revision: introduce setup_revision_optJunio C Hamano1-1/+4
2010-03-08git status: Show detailed dirty status of submodules in long formatJens Lehmann1-2/+4
2010-03-04git diff --submodule: Show detailed dirty status of submodulesJens Lehmann1-8/+8
2010-01-26Merge branch 'jl/diff-submodule-ignore'Junio C Hamano1-5/+7
2010-01-24git diff: Don't test submodule dirtiness with --ignore-submodulesJens Lehmann1-4/+6
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano1-18/+1
2010-01-24Make ce_uptodate() trustworthy againJunio C Hamano1-1/+1
2010-01-18Performance optimization for detection of modified submodulesJens Lehmann1-15/+31
2010-01-16Show submodules as modified when they contain a dirty work treeJens Lehmann1-2/+6
2010-01-13Merge branch 'nd/sparse'Junio C Hamano1-2/+3
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano1-0/+1
2010-01-07unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano1-18/+0
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano1-2/+2
2009-10-11diff-lib.c: fix misleading comments on oneway_diff()Junio C Hamano1-1/+1
2009-08-28Merge branch 'jc/shortstatus'Junio C Hamano1-20/+2
2009-08-23Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy1-2/+3
2009-08-11Prevent diff machinery from examining assume-unchanged entries on worktreeNguyễn Thái Ngọc Duy1-2/+4
2009-08-05diff-index: keep the original index intactJunio C Hamano1-18/+0
2009-08-05diff-index: report unmerged new entriesJunio C Hamano1-2/+2
2009-07-29diff: Rename QUIET internal option to QUICKJunio C Hamano1-2/+2
2009-06-20Merge branch 'jc/cache-tree'Junio C Hamano1-0/+3
2009-05-25Avoid "diff-index --cached" optimization under --find-copies-harderJunio C Hamano1-2/+3
2009-05-25Optimize "diff-index --cached" using cache-treeJunio C Hamano1-0/+2
2009-05-23Merge branch 'lt/maint-diff-reduce-lstat'Junio C Hamano1-1/+1
2009-05-09Avoid unnecessary 'lstat()' calls in 'get_stat_data()'Linus Torvalds1-1/+1
2009-03-17Merge branch 'kb/checkout-optim'Junio C Hamano1-1/+1
2009-02-10Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer1-0/+15
2009-02-09lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik1-1/+1
2009-01-11Cleanup of unused symcache variable inside diff-lib.cKjetil Barvik1-29/+11
2008-08-30diff: vary default prefix depending on what are comparedJunio C Hamano1-0/+3
2008-07-16Fix buffer overflow in git diffDmitry Potapov1-4/+4
2008-05-24"git diff": do not ignore index without --no-indexJunio C Hamano1-323/+0
2008-05-10Optimize symlink/directory detectionLinus Torvalds1-5/+5
2008-05-10Merge branch 'py/diff-submodule'Junio C Hamano1-7/+26
2008-05-05Merge branch 'jc/lstat'Junio C Hamano1-2/+5
2008-05-04diff-lib.c: rename check_work_tree_entity()Junio C Hamano1-4/+4
2008-05-04diff: a submodule not checked out is not modifiedJunio C Hamano1-3/+22
2008-04-29git-svn: detect and fail gracefully when dcommitting to a voidMatthieu Moy1-0/+3
2008-04-12diff-files: mark an index entry we know is up-to-date as suchJunio C Hamano1-2/+5
2008-03-30diff-files: careful when inspecting work tree itemsJunio C Hamano1-6/+11
2008-03-30diff-index: careful when inspecting work tree itemsJunio C Hamano1-14/+55
2008-03-10unpack_trees(): fix diff-index regression.Linus Torvalds1-0/+18
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds1-41/+8
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds1-0/+2
2008-03-02diff-lib.c: constness strengtheningJunio C Hamano1-7/+6
2008-02-09Allow callers of unpack_trees() to handle failureDaniel Barkalow1-2/+4
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 12:54:58 +0000