aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
2024-02-14Merge branch 'js/check-null-from-read-object-file'Junio C Hamano1-0/+2
2024-02-06Always check the return value of `repo_read_object_file()`Johannes Schindelin1-0/+2
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-04-24commit.h: reduce unnecessary includesElijah Newren1-0/+1
2023-04-24treewide: remove cache.h inclusion due to previous changesElijah Newren1-1/+1
2023-04-11treewide: remove double forward declaration of read_in_fullElijah 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 convert.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-4/+4
2023-03-28libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+3
2023-03-21environment.h: move declarations for environment.c functions from cache.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-07-11Merge branch 'rs/combine-diff-with-incompatible-options'Junio C Hamano1-0/+7
2022-06-21combine-diff: abort if --output is givenRené Scharfe1-0/+3
2022-06-21combine-diff: abort if --ignore-matching-lines is givenRené Scharfe1-0/+4
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-2/+2
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-2/+3
2021-05-11xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason1-2/+3
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-1/+1
2021-03-13use CALLOC_ARRAYRené Scharfe1-10/+10
2020-10-05Merge branch 'jk/diff-cc-oidfind-fix'Junio C Hamano1-2/+41
2020-09-30combine-diff: handle --find-object in multitree code pathJeff King1-2/+41
2020-09-29diff: get rid of redundant 'dense' argumentSergey Organov1-12/+9
2020-03-30oid_array: rename source file from sha1-arrayJeff King1-1/+1
2019-08-19combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algobrian m. carlson1-1/+1
2019-03-07Merge branch 'en/combined-all-paths'Junio C Hamano1-11/+65
2019-02-07log,diff-tree: add --combined-all-paths optionElijah Newren1-11/+65
2019-02-05Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano1-6/+11
2019-01-24combine-diff: treat --dirstat like --statJeff King1-0/+1
2019-01-24combine-diff: treat --summary like --statJeff King1-0/+1
2019-01-24combine-diff: treat --shortstat like --statJeff King1-0/+1
2019-01-24combine-diff: factor out stat-format maskJeff King1-6/+8
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-1/+1
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano1-31/+36
2018-11-12notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-1/+1
2018-11-05combine-diff: use an xdiff hunk callbackJeff King1-31/+36
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King1-2/+2
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-13/+19
2018-09-21userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy1-11/+16
2018-09-21combine-diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+2
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-2/+2
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-1/+1
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-2/+2
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano1-6/+6
2018-02-22combine-diff: rename 'new' variablesBrandon Williams1-6/+6
2018-02-13Merge branch 'tb/crlf-conv-flags'Junio C Hamano1-1/+1
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsTorsten Bögershausen1-1/+1
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-5/+5
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-5/+5
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams1-3/+3
2017-10-16refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson1-1/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano1-1/+1
2017-06-13convert: convert convert_to_git to take an indexBrandon Williams1-1/+1
2017-06-05tree-diff: convert diff_tree_paths to struct object_idBrandon Williams1-5/+5
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams1-2/+2
2017-06-02combine-diff: convert find_paths_* to struct object_idBrandon Williams1-6/+6
2017-06-02combine-diff: convert diff_tree_combined to struct object_idBrandon Williams1-5/+5
2017-06-02diff: convert fill_filespec to struct object_idBrandon Williams1-2/+2
2017-04-19Merge branch 'bc/object-id'Junio C Hamano1-9/+9
2017-03-31Rename sha1_array to oid_arraybrian m. carlson1-6/+6
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson1-1/+1
2017-03-30combine-diff: replace malloc/snprintf with xstrfmtJeff King1-3/+4
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson1-3/+3
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King1-2/+2
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King1-3/+3
2016-07-19Merge branch 'bc/cocci'Junio C Hamano1-7/+7
2016-06-28diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson1-2/+2
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson1-5/+5
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano1-1/+1
2016-05-09combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-02-22use st_add and st_mult for allocation size computationJeff King1-7/+7
2016-02-22convert trivial cases to FLEX_ARRAY macrosJeff King1-3/+1
2016-02-22use xmallocz to avoid size arithmeticJeff King1-3/+1
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King1-2/+2
2015-11-20Remove get_object_hash.brian m. carlson1-2/+2
2015-11-20Add several uses of get_object_hash.brian m. carlson1-2/+2
2015-09-28Sync with 2.4.10Junio C Hamano1-2/+4
2015-09-28Sync with 2.3.10Junio C Hamano1-2/+4
2015-09-28react to errors in xdi_diffJeff King1-2/+4
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano1-3/+3
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King1-3/+3
2015-03-13diff: convert struct combine_diff_path to object_idbrian m. carlson1-28/+28
2014-09-02Merge branch 'jk/pretty-empty-format'Junio C Hamano1-1/+2
2014-08-26Merge branch 'jk/diff-tree-t-fix'Junio C Hamano1-1/+11
2014-08-20intersect_paths: respect mode in git's tree-sortJeff King1-1/+11
2014-07-30pretty: make empty userformats truly emptyJeff King1-1/+2
2014-06-06Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano1-1/+2
2014-05-15git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov1-1/+2
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov1-5/+83
2014-02-24combine-diff: move changed-paths scanning logic into its own functionKirill Smelkov1-27/+53
2014-02-24combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov1-10/+14
2014-02-24combine-diff: simplify intersect_paths() furtherJunio C Hamano1-22/+12
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov1-21/+9
2014-02-24combine-diff: optimize combine_diff_path sets intersectionKirill Smelkov1-21/+73
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-2/+2
2013-09-09Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano1-1/+2
2013-08-01log: use true parents for diff even when rewritingThomas Rast1-1/+2
2013-07-29many small typofixesOndřej Bílka1-1/+1
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy1-2/+2
2013-06-11Merge branch 'cb/log-follow-with-combined'Junio C Hamano1-0/+3
2013-06-02Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano1-2/+5
2013-05-28fix segfault with git log -c --followClemens Buchacher1-0/+3
2013-05-15combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman1-2/+5
2013-03-25combine-diff: coalesce lost lines optimallyAntoine Pelisse1-64/+191
2013-03-14Allow combined diff to ignore white-spacesAntoine Pelisse1-7/+50
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano1-17/+32
2013-02-12combine-diff.c: teach combined diffs about line prefixJohn Keeping1-17/+30
2013-02-03combine-diff: lift 32-way limit of combined diffJunio C Hamano1-14/+7
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano1-2/+2
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano1-2/+2
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-2/+2
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano1-1/+1
2012-03-25combine-diff: fix loop index underflowRené Scharfe1-1/+1
2011-12-17pass struct commit to diff_tree_combined_merge()René Scharfe1-4/+3
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-21/+13
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-4/+3
2011-08-28Merge branch 'jc/combine-diff-callback'Junio C Hamano1-0/+69
2011-08-20combine-diff: support format_callbackJunio C Hamano1-0/+69
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-4/+3
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano1-4/+10
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano1-4/+10
2011-05-24combine-diff: respect textconv attributesJeff King1-9/+32
2011-05-23combine-diff: handle binary files as binaryJeff King1-2/+35
2011-05-23combine-diff: calculate mode_differs earlierJeff King1-2/+7
2011-05-23combine-diff: split header printing into its own functionJeff King1-61/+74
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano1-1/+1
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano1-1/+1
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe1-2/+1
2010-05-02git diff too slow for a fileRené Scharfe1-1/+1
2010-04-17combined diff: correctly handle truncated fileThomas Rast1-6/+8
2009-11-28Give the hunk comment its own colorBert Wesarg1-1/+4
2009-07-22Merge branch 'maint'Junio C Hamano1-15/+14
2009-07-22diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano1-7/+9
2009-07-22combine-diff.c: fix performance problem when folding common deleted linesJunio C Hamano1-8/+5
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-1/+1
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras1-2/+2
2009-04-29Merge branch 'maint'Junio C Hamano1-9/+25
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-12/+26
2009-04-29diff -c -p: do not die on submodulesJunio C Hamano1-12/+26
2009-03-17Merge branch 'kb/checkout-optim'Junio C Hamano1-3/+1
2009-03-07Move local variables to narrower scopesBenjamin Kramer1-2/+1
2009-02-09show_patch_diff(): remove a call to fstat()Kjetil Barvik1-3/+1
2008-12-17combine-diff.c: use strbuf_readlink()Junio C Hamano1-5/+5
2008-10-25Always initialize xpparam_t to 0Brian Downing1-0/+1
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-2/+1
2008-09-18Merge branch 'jc/diff-prefix'Junio C Hamano1-2/+6
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano1-2/+14
2008-08-30diff: vary default prefix depending on what are comparedJunio C Hamano1-2/+6
2008-08-30diff: Help "less" hide ^M from the outputJunio C Hamano1-2/+14
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano1-0/+12
2008-08-23Respect core.autocrlf in combined diffAlexander Gavrilov1-0/+12
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano1-5/+2
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing1-3/+2
2008-06-22Merge branch 'jc/maint-combine-diff-pre-context'Junio C Hamano1-2/+5
2008-06-18diff -c/--cc: do not include uninteresting deletion before leading contextJunio C Hamano1-2/+5
2008-05-03Cleanup xread() loops to use read_in_full()Heikki Orsila1-9/+8
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins1-3/+3
2008-04-27Die for an early EOF in a file reading loopHeikki Orsila1-3/+3
2007-12-26Fix rewrite_diff() name quoting.Junio C Hamano1-10/+1
2007-12-26combine-diff: Fix path quotingJunio C Hamano1-10/+31
2007-12-13xdl_diff: identify call sites.Junio C Hamano1-1/+1
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit1-5/+5
2007-09-20Full rework of quote_c_style and write_name_quoted.Pierre Habouzit1-14/+2
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin1-2/+1
2007-05-15Ensure return value from xread() is always stored into an ssize_tJohan Herland1-1/+1
2007-04-22Support 'diff=pgm' attributeJunio C Hamano1-0/+1
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce1-2/+2
2007-03-03Tell multi-parent diff about core.symlinks.Johannes Sixt1-0/+10
2007-02-27convert object type handling from a string to a numberNicolas Pitre1-3/+3
2007-02-27diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering1-3/+3
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano1-4/+21
2007-02-03combine-diff: special case --unified=0Junio C Hamano1-4/+30
2006-10-26Merge branch 'jc/combined'Junio C Hamano1-4/+8
2006-10-26combine-diff: honour --no-commit-idJunio C Hamano1-3/+3
2006-10-26combine-diff: fix hunk_comment_line logic.Junio C Hamano1-1/+5
2006-10-26Merge branch 'jc/combined'Junio C Hamano1-5/+43
2006-10-26combine-diff: a few more finishing touches.Junio C Hamano1-5/+43
2006-10-13diff --numstatJunio C Hamano1-3/+6
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-5/+5
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes1-2/+2
2006-08-15make inline is_null_sha1 globalDavid Rientjes1-2/+2
2006-08-14Remove combine-diff.c::uninteresting()Junio C Hamano1-9/+2
2006-08-13Fix type of combine-diff.c::show_patch_diff()Junio C Hamano1-7/+5
2006-08-10combine-diff: use colorJunio C Hamano1-16/+34
2006-07-25Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen1-2/+1
2006-07-10Fix more typos, primarily in the codePavel Roskin1-1/+1
2006-07-05Merge branch 'th/diff'Junio C Hamano1-34/+34
2006-06-28combine-diff.c: type sanity.Junio C Hamano1-1/+1
2006-06-28combine-diff.c: type sanityJunio C Hamano1-14/+15
2006-06-27Fix some more diff options changes.Junio C Hamano1-9/+15
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 08:06:51 +0000