aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/diff.c
AgeCommit message (Expand)AuthorFilesLines
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-3/+3
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-2/+0
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic1-3/+1
2023-09-18diff --stat: add config option to limit filename widthDragan Simic1-0/+1
2023-08-21diff: drop useless "status" parameter from diff_result_code()Jeff King1-1/+1
2023-08-21diff: drop useless return values in git-diff helpersJeff King1-34/+28
2023-08-21diff: drop useless return from run_diff_{files,index} functionsJeff King1-2/+4
2023-08-21diff: die when failing to read index in git-diff builtinJeff King1-6/+3
2023-08-21diff: show usage for unknown builtin_diff_files() optionsJeff King1-2/+4
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-2/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-21preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren1-0/+1
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano1-0/+1
2023-04-24commit.h: reduce unnecessary includesElijah Newren1-0/+1
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+2
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-1/+2
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-1/+2
2023-03-28mark "argv" as unused when we check argcJeff King1-3/+3
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano1-1/+1
2022-11-21built-ins: use free() not UNLEAK() if trivial, rm dead codeÆvar Arnfjörð Bjarmason1-1/+1
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-11/+14
2022-10-28Merge branch 'ab/doc-synopsis-and-cmd-usage'Junio C Hamano1-1/+2
2022-10-13built-ins: consistently add "\n" between "usage" and optionsÆvar Arnfjörð Bjarmason1-1/+2
2022-10-01diff: support ^! for mergesRené Scharfe1-5/+18
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano1-1/+1
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano1-1/+1
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano1-1/+1
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-1/+1
2022-04-13revisions API: call diff_free(&revs->pruning) in revisions_release()Ævar Arnfjörð Bjarmason1-1/+0
2022-04-13revisions API users: use release_revisions() with UNLEAK()Ævar Arnfjörð Bjarmason1-0/+1
2022-02-02builtin/diff.c: fix "git-diff" usage string typoShaoxuan Yuan1-3/+3
2021-12-06diff: enable and test the sparse indexLessley Dennington1-0/+5
2021-07-28Merge branch 'dl/diff-merge-base'Junio C Hamano1-2/+2
2021-07-12git-diff: fix missing --merge-base docsDenton Liu1-2/+2
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-1/+1
2021-02-25Merge branch 'jc/diffcore-rotate'Junio C Hamano1-0/+1
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano1-0/+1
2021-02-12Merge branch 'tb/precompose-prefix-too'Junio C Hamano1-1/+1
2021-02-05Merge branch 'so/log-diff-merge'Junio C Hamano1-4/+5
2021-02-03MacOS: precompose_argv_prefix()Torsten Bögershausen1-1/+1
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Sergey Organov1-4/+5
2020-11-02Merge branch 'dl/diff-merge-base'Junio C Hamano1-16/+33
2020-09-29diff: get rid of redundant 'dense' argumentSergey Organov1-2/+1
2020-09-21builtin/diff-tree: learn --merge-baseDenton Liu1-12/+27
2020-09-20builtin/diff-index: learn --merge-baseDenton Liu1-0/+2
2020-09-20diff-lib: accept option flags in run_diff_index()Denton Liu1-4/+4
2020-07-09Merge branch 'ct/diff-with-merge-base-clarification' into masterJunio C Hamano1-1/+1
2020-07-08diff: check for merge bases before assigning sym->baseJeff King1-1/+1
2020-06-29Merge branch 'dl/diff-usage-comment-update'Junio C Hamano1-3/+12
2020-06-25Merge branch 'ct/diff-with-merge-base-clarification'Junio C Hamano1-14/+118
2020-06-23builtin/diff: fix botched update of usage commentDenton Liu1-4/+1
2020-06-18builtin/diff: update usage commentDenton Liu1-3/+15
2020-06-12Documentation: usage for diff combined commitsChris Torek1-1/+7
2020-06-12git diff: improve range handlingChris Torek1-13/+111
2020-03-30oid_array: rename source file from sha1-arrayJeff King1-1/+1
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano1-19/+3
2019-03-24diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy1-18/+3
2019-03-07Merge branch 'jk/diff-no-index-initialize'Junio C Hamano1-9/+11
2019-02-24diff: reuse diff setup for --no-index caseJeff King1-9/+11
2019-02-06Merge branch 'sl/const'Junio C Hamano1-1/+1
2019-02-04various: tighten constness of some local variablesShahzad Lone1-1/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2019-01-14read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy1-1/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-2/+2
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-06-29tag: add repository argument to deref_tagStefan Beller1-1/+1
2018-06-29tree: add repository argument to lookup_treeStefan Beller1-1/+2
2018-06-29object: add repository argument to parse_objectStefan Beller1-1/+1
2018-06-25Merge branch 'nd/diff-apply-ita'Junio C Hamano1-0/+7
2018-05-29diff: turn --ita-invisible-in-index on by defaultNguyễn Thái Ngọc Duy1-0/+7
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee1-1/+1
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee1-1/+1
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-4/+4
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano1-4/+3
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-4/+4
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-3/+3
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams1-1/+1
2017-10-07Merge branch 'ma/builtin-unleak'Junio C Hamano1-0/+3
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-4/+3
2017-10-02builtin/: add UNLEAKsMartin Ågren1-0/+3
2017-08-03submodule: remove gitmodules_configBrandon Williams1-2/+0
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Junio C Hamano1-4/+4
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams1-1/+1
2017-06-02Merge branch 'jk/diff-blob'Junio C Hamano1-31/+29
2017-06-02combine-diff: convert diff_tree_combined to struct object_idBrandon Williams1-1/+1
2017-06-02diff: convert fill_filespec to struct object_idBrandon Williams1-2/+2
2017-05-24diff: use blob path for blob/file diffsJeff King1-1/+2
2017-05-24diff: use pending "path" if it is availableJeff King1-1/+6
2017-05-24diff: use the word "path" instead of "name" for blobsJeff King1-7/+7
2017-05-24diff: pass whole pending entry in blobinfoJeff King1-23/+15
2017-05-08object: convert parse_object* to take struct object_idbrian m. carlson1-1/+1
2017-05-08Convert lookup_tree to struct object_idbrian m. carlson1-1/+1
2017-05-02Clean up outstanding object_id transforms.brian m. carlson1-1/+1
2017-03-31Rename sha1_array to oid_arraybrian m. carlson1-3/+3
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson1-1/+1
2017-03-26builtin/diff: convert to struct object_idbrian m. carlson1-17/+17
2017-01-30use SWAP macroRené Scharfe1-6/+3
2016-09-21Merge branch 'jk/setup-sequence-update'Junio C Hamano1-13/+14
2016-09-13diff: always try to set up the repositoryJeff King1-2/+2
2016-09-13diff: skip implicit no-index check when given --no-indexJeff King1-12/+13
2016-06-06Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano1-0/+1
2016-05-23Merge branch 'ar/diff-args-osx-precompose'Junio C Hamano1-0/+1
2016-05-13diff: run arguments through precompose_argvAlexander Rinass1-0/+1
2016-02-25diff: activate diff.renames by defaultMatthieu Moy1-0/+1
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano1-1/+1
2016-01-21diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy1-1/+1
2015-11-20Remove get_object_hash.brian m. carlson1-6/+6
2015-11-20Add several uses of get_object_hash.brian m. carlson1-6/+6
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2013-12-27Merge branch 'tg/diff-no-index-refactor'Junio C Hamano1-5/+53
2013-12-16diff: avoid some nestingThomas Gummerer1-18/+17
2013-12-12diff: don't read index when --no-index is givenThomas Gummerer1-2/+5
2013-12-12diff: move no-index detection to builtin/diff.cThomas Gummerer1-3/+49
2013-12-06Merge branch 'nd/magic-pathspec'Junio C Hamano1-10/+7
2013-11-20diff: restrict pathspec limitations to diff b/f case onlyNguyễn Thái Ngọc Duy1-10/+7
2013-10-31diff: trivial style fixFelipe Contreras1-1/+1
2013-07-15pathspec: support :(literal) syntax for noglob pathspecNguyễn Thái Ngọc Duy1-1/+1
2013-07-15convert read_cache_preload() to take struct pathspecNguyễn Thái Ngọc Duy1-2/+2
2013-07-15guard against new pathspec magic in pathspec matching codeNguyễn Thái Ngọc Duy1-0/+2
2013-05-28cmd_diff(): make it obvious which cases are exclusive of each otherMichael Haggerty1-5/+4
2013-05-28cmd_diff(): rename local variable "list" -> "entry"Michael Haggerty1-4/+4
2013-05-28cmd_diff(): use an object_array for holding treesMichael Haggerty1-19/+18
2013-05-28builtin_diff_tree(): make it obvious that function wants two entriesMichael Haggerty1-9/+10
2012-11-20Merge branch 'kb/preload-index-more'Junio C Hamano1-4/+8
2012-11-02update-index/diff-index: use core.preloadindex to improve performanceKarsten Blees1-4/+8
2012-10-29Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy1-16/+0
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano1-2/+1
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano1-2/+6
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano1-2/+6
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-2/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-2/+1
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-2/+6
2012-06-15fix pager.diff with diff --no-indexJeff King1-7/+17
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINJeff King1-1/+1
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek1-1/+2
2012-03-01diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek1-0/+3
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-6/+6
2011-11-06cast variable in call to free() in builtin/diff.c and submodule.cÆvar Arnfjörð Bjarmason1-1/+1
2011-08-19want_color: automatically fallback to color.uiJeff King1-3/+0
2011-06-20plug a few coverity-spotted leaksJim Meyering1-0/+1
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano1-3/+1
2011-04-01Merge branch 'ab/i18n-st'Junio C Hamano1-9/+9
2011-03-26Merge branch 'jc/index-update-if-able'Junio C Hamano1-6/+1
2011-03-22builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano1-3/+1
2011-03-21diff/status: refactor opportunistic index updateJunio C Hamano1-6/+1
2011-03-09i18n: git-diff basic messagesÆvar Arnfjörð Bjarmason1-9/+9
2011-02-27Merge branch 'nd/struct-pathspec'Junio C Hamano1-10/+6
2011-02-07diff: support --cached on unborn branchesNguyễn Thái Ngọc Duy1-2/+5
2011-02-03struct rev_info: convert prune_data to struct pathspecNguyễn Thái Ngọc Duy1-8/+4
2011-02-03Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy1-2/+2
2010-11-05diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec1-1/+1
2010-08-09Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann1-0/+2
2010-07-16Merge branch 'jc/diff-merge-base-multi'Junio C Hamano1-13/+0
2010-07-15Merge branch 'jc/diff-merge-base-multi'Junio C Hamano1-8/+23
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+425