projects
/
git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
The second batch
2021-05-27
Elijah Newren
dir: introduce readdir_skip_dot_and_dotdot() helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort, diffcore-rename: employ cached renames when...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: handle interactions of caching and rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: add helper functions for using cached renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: preserve cached renames for the appropriate...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: avoid accidental API mis-use
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: add code to check for whether cached renames...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: populate caches of rename detection results
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: add data structures for in-memory caching...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
t6429: testcases for remembering renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
fast-rebase: write conflict state to working tree,...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
fast-rebase: change assert() to BUG()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
Documentation/technical: describe remembering renames...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-13
Elijah Newren
git-prompt: work under set -u
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: introduce readdir_skip_dot_and_dotdot() helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: traverse into untracked directories if they may...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: avoid unnecessary traversal into ignored directory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
t3001, t7300: add testcase showcasing missed directory...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
t7300: add testcase showing unnecessary traversal into...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
ls-files: error out on -i unless -o or -c are specified
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: report number of visited directories and paths...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: convert trace calls to trace2 equivalents
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-04
Elijah Newren
t6423: rename file within directory that other side...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-31
Elijah Newren
sequencer: fix edit handling for cherry-pick and revert...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
Add testing with merge-ort merge strategy
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
t6423: mark remaining expected failure under merge...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
Revert "merge-ort: ignore the directory rename split...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-recursive: add a bunch of FIXME comments documenting...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
t: mark several submodule merging tests as fixed under...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: implement CE_SKIP_WORKTREE handling with...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
t6428: new test for SKIP_WORKTREE handling and conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: support subtree shifting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: let renormalization change modify/delete...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: have ll_merge() use a special attr_index...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: add a special minimal index just for renormalization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: use STABLE_QSORT instead of QSORT where...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename: determine which relevant_sources are...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
merge-ort: record the reason that we want a rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename: add computation of number of unknown...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename: check if we have enough renames for...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename: only compute dir_rename_count for...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
merge-ort: record the reason that we want a rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
merge-ort, diffcore-rename: tweak dirs_removed and...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename: take advantage of "majority rules...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
diffcore-rename: avoid doing basename comparisons for...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: skip rename detection entirely if possible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: use relevant_sources to filter possible...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: precompute whether directory rename detection...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: introduce wrappers for alternate tree traversal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: add data structures for an alternate tree...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: precompute subset of sources for which we...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
diffcore-rename: enable filtering possible rename sources
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-04
Elijah Newren
Documentation/RelNotes: improve release note for rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: compute dir_rename_guess from dir_rename_counts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: limit dir_rename_counts computation...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: compute dir_rename_counts in stages
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: extend cleanup_dir_rename_info()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: move dir_rename_counts into dir_rename_info...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: add function for clearing dir_rename_count
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
Move computation of dir_rename_count from merge-ort...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: add a mapping of destination names...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: provide basic implementation of idx_possibl...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename: use directory rename guided basename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
merge-ort: call diffcore_rename() directly
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
gitdiffcore doc: mention new preliminary step for rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcore-rename: guide inexact rename detection based...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcore-rename: complete find_basename_matches()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcore-rename: compute basenames of source and dest...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
t4001: add a test comparing basename similarity and...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcore-rename: filter rename_src list when possible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-12
Elijah Newren
diffcore-rename: no point trying to find a match better...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
merge-ort: begin performance work; instrument with...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
merge-ort: ignore the directory rename split conflict...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
merge-ort: fix massive leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: fix a directory rename detection bug
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: process_renames() now needs more defensiveness
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement apply_directory_rename_modifications()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: add a new toplevel_dir field
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement handle_path_level_conflicts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement check_for_directory_rename()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement apply_dir_rename() and check_dir_renamed()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement compute_collisions()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: modify collect_renames() for directory rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement handle_directory_level_conflicts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement compute_rename_counts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: copy get_renamed_dir_portion() from merge...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: add outline of get_provisional_directory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: add outline for computing directory renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Newren
merge-ort: collect which directories are removed in...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Newren
merge-ort: initialize and free new directory rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Newren
merge-ort: add new data structures for directory rename...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
diffcore-rename: remove unnecessary duplicate entry...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: add handling for different types of files...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: copy find_first_merges() implementation...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: implement format_commit()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: copy and adapt merge_submodule() from merge...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: copy and adapt merge_3way() from merge-recursive.c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: flesh out implementation of handle_content_merge()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: handle book-keeping around two- and three...
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next