Show patches with: Submitter = Elijah Newren       |    State = Action Required       |    Archived = No       |   71 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[12/12] git-merge-tree.txt: add a section on potentional usage mistakes RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[11/12] merge-tree: add a --allow-unrelated-histories flag RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[10/12] merge-tree: provide easy access to `ls-files -u` style info RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[09/12] merge-tree: provide a list of which files have conflicts RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[08/12] merge-ort: provide a merge_get_conflicted_files() helper function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[07/12] merge-tree: support including merge messages in output RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[06/12] merge-ort: allow update messages to be written to different file stream RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[05/12] merge-ort: split out a separate display_update_messages() function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[04/12] merge-tree: implement real merges RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[03/12] merge-tree: add option parsing and initial shell for real merge function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[02/12] merge-tree: move logic for existing merge into new function RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[01/12] merge-tree: rename merge_trees() to trivial_merge_trees() RFC: In-core git merge-tree ("Server side merges") - - - --- 2022-01-22 Elijah Newren New
[v4,10/10] diff-merges: avoid history simplifications when diffing merges Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,09/10] merge-ort: mark conflict/warning messages from inner merges as omittable Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,08/10] show, log: include conflict/warning messages in --remerge-diff headers Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,07/10] diff: add ability to insert additional headers for paths Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,06/10] merge-ort: format messages slightly different for use in headers Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,05/10] merge-ort: mark a few more conflict messages as omittable Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,04/10] merge-ort: capture and print ll-merge warnings in our preferred fashion Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,03/10] ll-merge: make callers responsible for showing warnings Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,02/10] log: clean unneeded objects during `log --remerge-diff` Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[v4,01/10] show, log: provide a --remerge-diff capability Add a new --remerge-diff capability to show & log - - - --- 2022-01-21 Elijah Newren New
[2/2] merge: fix memory leaks in cmd_merge() Fix some old memory leaks in merge-ort and builtin/merge - - - --- 2022-01-20 Elijah Newren New
[1/2] merge-ort: fix memory leak in merge_ort_internal() Fix some old memory leaks in merge-ort and builtin/merge - - - --- 2022-01-20 Elijah Newren New
leak tests: ignore some new leaks in a few tests leak tests: ignore some new leaks in a few tests - - - --- 2022-01-14 Elijah Newren New
[v2,5/5] Accelerate clear_skip_worktree_from_present_files() by caching Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren New
[v2,4/5] Update documentation related to sparsity and the skip-worktree bit Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren New
[v2,3/5] repo_read_index: clear SKIP_WORKTREE bit from files present in worktree Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren New
[v2,2/5] unpack-trees: fix accidental loss of user changes Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren New
[v2,1/5] t1011: add testcase demonstrating accidental loss of user modifications Remove the present-despite-SKIP_WORKTREE class of bugs (for sparse-checkouts) - - - --- 2022-01-14 Elijah Newren New
[RFC,5/5] Accelerate ensure_skip_worktree_means_skip_worktree by caching Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[RFC,4/5] Update documentation related to sparsity and the skip-worktree bit Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[RFC,3/5] repo_read_index: ensure SKIP_WORKTREE means skip worktree Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[RFC,2/5] unpack-trees: fix accidental loss of user changes Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[RFC,1/5] t1011: add testcase demonstrating accidental loss of user modifications Remove the present-despite-SKIP_WORKTREE class of bugs - - - --- 2022-01-09 Elijah Newren New
[v2,8/8] merge-tree: provide an easy way to access which files have conflicts RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,7/8] merge-tree: support saving merge messages to a separate file RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,6/8] merge-ort: allow update messages to be written to different file stream RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,5/8] merge-ort: split out a separate display_update_messages() function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,4/8] merge-tree: implement real merges RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,3/8] merge-tree: add option parsing and initial shell for real merge function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,2/8] merge-tree: move logic for existing merge into new function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
[v2,1/8] merge-tree: rename merge_trees() to trivial_merge_trees() RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2022-01-05 Elijah Newren New
t4126: this test does not pass SANITIZE_LEAK; quit claiming it does t4126: this test does not pass SANITIZE_LEAK; quit claiming it does - - - --- 2021-12-31 Elijah Newren New
[8/8] merge-tree: provide an easy way to access which files have conflicts RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[7/8] merge-tree: support saving merge messages to a separate file RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[6/8] merge-ort: allow update messages to be written to different file stream RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[5/8] merge-ort: split out a separate display_update_messages() function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[4/8] merge-tree: implement real merges RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[3/8] merge-tree: add option parsing and initial shell for real merge function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[2/8] merge-tree: move logic for existing merge into new function RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[1/8] merge-tree: rename merge_trees() to trivial_merge_trees() RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) - - - --- 2021-12-31 Elijah Newren New
[v2,8/8] show, log: include conflict/warning messages in --remerge-diff headers Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,7/8] diff: add ability to insert additional headers for paths Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,6/8] merge-ort: format messages slightly different for use in headers Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,5/8] merge-ort: mark a few more conflict messages as omittable Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,4/8] merge-ort: capture and print ll-merge warnings in our preferred fashion Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,3/8] ll-merge: make callers responsible for showing warnings Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,2/8] log: clean unneeded objects during `log --remerge-diff` Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v2,1/8] show, log: provide a --remerge-diff capability Add a new --remerge-diff capability to show & log - - - --- 2021-12-25 Elijah Newren New
[v4,11/11] t2501: simplify the tests since we can now assume desired behavior Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,10/11] dir: new flag to remove_dir_recurse() to spare the original_cwd Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,09/11] dir: avoid incidentally removing the original_cwd in remove_path() Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,08/11] stash: do not attempt to remove startup_info->original_cwd Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,07/11] rebase: do not attempt to remove startup_info->original_cwd Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,06/11] clean: do not attempt to remove startup_info->original_cwd Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,05/11] symlinks: do not include startup_info->original_cwd in dir removal Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,04/11] unpack-trees: add special cwd handling Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,03/11] unpack-trees: refuse to remove startup_info->original_cwd Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,02/11] setup: introduce startup_info->original_cwd Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New
[v4,01/11] t2501: add various tests for removing the current working directory Avoid removing the current working directory, even if it becomes empty - - - --- 2021-11-29 Elijah Newren New