aboutsummaryrefslogtreecommitdiffstats
path: root/diff-lib.c
AgeCommit message (Expand)AuthorFilesLines
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
2008-01-21Also use unpack_trees() in do_diff_cache()Johannes Schindelin1-79/+13
2008-01-21Make run_diff_index() use unpack_trees(), not read_tree()Linus Torvalds1-14/+137
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds1-18/+14
2007-11-26Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.cSteffen Prohaska1-1/+1
2007-11-18Merge branch 'ph/diffopts'Junio C Hamano1-11/+13
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit1-11/+13
2007-11-10git-add: make the entry stat-clean after re-adding the same contentsJunio C Hamano1-1/+3
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano1-7/+9
2007-09-14diff --no-index: do not forget to run diff_setup_done()Junio C Hamano1-0/+2
2007-08-14diff: squelch empty diffs even moreRené Scharfe1-2/+6
2007-07-07diff-lib.c: don't strdup twiceRené Scharfe1-1/+1
2007-06-07War on whitespaceJunio C Hamano1-1/+1
2007-04-21Merge branch 'lt/gitlink'Junio C Hamano1-12/+3
2007-04-13Do not default to --no-index when given two directories.Junio C Hamano1-10/+26
2007-04-09diff-lib: use ce_mode_from_stat() rather than messing with modes manuallyLinus Torvalds1-12/+3
2007-03-14Teach --quiet to diff backends.Junio C Hamano1-0/+6
2007-03-14Allow git-diff exit with codes similar to diff(1)Alex Riesen1-1/+4
2007-03-10Merge branch 'js/diff-ni'Junio C Hamano1-15/+27
2007-03-04Merge branch 'js/symlink'Junio C Hamano1-0/+3
2007-03-04diff --no-index: support /dev/null as filenameJohannes Schindelin1-17/+17
2007-03-04diff-ni: fix the diff with standard inputJunio C Hamano1-5/+11
2007-03-03diff: support reading a file from stdin via "-"Johannes Schindelin1-5/+11
2007-03-03diff-ni: allow running from a subdirectory.Junio C Hamano1-1/+13
2007-03-02Add core.symlinks to mark filesystems that do not support symbolic links.Johannes Sixt1-0/+3
2007-02-28diff: make more cases implicit --no-indexJohannes Schindelin1-0/+54
2007-02-26diff --no-index: also imitate the exit status of diff(1)Johannes Schindelin1-3/+8
2007-02-26Merge branch 'master' into js/diff-niJunio C Hamano1-3/+13
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano1-3/+13
2007-02-25Fix typo: do not show name1 when name2 failsJohannes Schindelin1-1/+1
2007-02-24Evil Merge branch 'jc/status' (early part) into js/diff-niJunio C Hamano1-9/+5
2007-02-22Teach git-diff-files the new option `--no-index`Johannes Schindelin1-0/+207
2007-02-22run_diff_{files,index}(): update calling convention.Junio C Hamano1-9/+1
2007-02-16Do not take mode bits from index after type change.Junio C Hamano1-3/+1
2007-02-05git-blame: no rev means start from the working tree file.Junio C Hamano1-1/+43
2007-01-06diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Junio C Hamano1-3/+6
2006-09-05diff-index --cc shows a 3-way diff between HEAD, index and working tree.Paul Mackerras1-0/+25
2006-08-23Convert memset(hash,0,20) to hashclr(hash).Junio C Hamano1-1/+1
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-2/+1
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes1-1/+1
2006-06-19Merge branch 'lt/objlist' into nextJunio C Hamano1-2/+2
2006-06-19Add "named object array" conceptLinus Torvalds1-2/+2
2006-06-18Don't instantiate structures with FAMs.Florian Forster1-19/+22
2006-04-22Libified diff-index: backward compatibility fix.Junio C Hamano1-1/+9
2006-04-22Libify diff-index.Junio C Hamano1-0/+203
2006-04-22Libify diff-files.Junio C Hamano1-1762/+100
2006-04-19diff --stat: do not drop rename information.Junio C Hamano1-9/+68
2006-04-19diff: move diff.c to diff-lib.c to make room.Junio C Hamano1-0/+1736