2020-11-03 |
Elijah Newren | merge,rebase,revert: select ort or recursive by config... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-29 |
Elijah Newren | fast-rebase: demonstrate merge-ort's API via new test... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-27 |
Elijah Newren | merge-ort-wrappers: new convience wrappers to mimic... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-27 |
Elijah Newren | merge-ort: barebones API of new merge strategy with... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | t6423: add more details about direct resolution of... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | t6423: note improved ort handling with untracked files Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | t6423, t6436: note improved ort handling with dirty... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | merge tests: expect slight differences in output for... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | t6423: expect improved conflict markers labels in the... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | t6404, t6423: expect improved rename/delete handling... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | t6416: correct expectation for rename/rename(1to2)... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | merge tests: expect improved directory/file conflict... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-26 |
Elijah Newren | t/: new helper for tests that pass with ort but fail... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-21 |
Elijah Newren | sequencer: remove duplicate rollback_lock_file() call Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-18 |
Elijah Newren | test-lib: reduce verbosity of skipped tests Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-18 |
Elijah Newren | t6006, t6012: adjust tests to use 'setup' instead of... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-18 |
Elijah Newren | test-lib: allow selecting tests by substring/glob with... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-18 |
Elijah Newren | t7518: fix flaky grep invocation Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-16 |
Elijah Newren | t6423: more involved rules for renaming directories... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-16 |
Elijah Newren | t6423: update directory rename detection tests with... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-16 |
Elijah Newren | t6423: more involved directory rename test Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-10-16 |
Elijah Newren | directory-rename-detection.txt: update references to... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-19 |
Elijah Newren | dir: fix problematic API to avoid memory leaks Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-19 |
Elijah Newren | dir: make clear_directory() free all relevant memory Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-18 |
Elijah Newren | mem-pool: use consistent pool variable name Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-18 |
Elijah Newren | mem-pool: use more standard initialization and finalization Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-18 |
Elijah Newren | mem-pool: add convenience functions for strdup and... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-14 |
Elijah Newren | sequencer: avoid garbled merge machinery messages due... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-12 |
Elijah Newren | dir: avoid prematurely marking nonbare repositories... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-12 |
Elijah Newren | t3000: fix some test description typos Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6425: be more flexible with rename/delete conflict... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t642[23]: be more flexible for add/add conflicts involving... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6422, t6426: be more flexible for add/add conflicts... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6423: add an explanation about why one of the tests... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6416, t6423: clarify some comments and fix some typos Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6422: fix multiple errors with the mod6 test expectations Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6423: fix test setup for a couple tests Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6416, t6422: fix incorrect untracked file count Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6422: fix bad check against missing file Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | t6418: tighten delete/normalize conflict testcase Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-10 |
Elijah Newren | Collect merge-related tests to t64xx Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-03 |
Elijah Newren | checkout: support renormalization with checkout -m... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-03 |
Elijah Newren | merge: make merge.renormalize work for all uses of... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-03 |
Elijah Newren | t6038: remove problematic test Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-03 |
Elijah Newren | t6038: make tests fail for the right reason Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-08-02 |
Elijah Newren | merge-recursive: fix unclear and outright wrong comments Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-07-28 |
Elijah Newren | hashmap: fix typo in usage docs Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-07-28 |
Elijah Newren | Remove doubled words in various comments Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-22 |
Elijah Newren | git-prompt: include sparsity state as well Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-22 |
Elijah Newren | git-prompt: document how in-progress operations affect... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-18 |
Elijah Newren | wt-status: show sparse checkout status as well Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-13 |
Elijah Newren | clean: optimize and document cases where we recurse... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-13 |
Elijah Newren | clean: consolidate handling of ignored parameters Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-13 |
Elijah Newren | dir, clean: avoid disallowed behavior Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-13 |
Elijah Newren | dir: fix a few confusing comments Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-13 |
Elijah Newren | git-sparse-checkout: clarify interactions with submodules Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-05 |
Elijah Newren | dir: fix treatment of negated pathspecs Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-06-05 |
Elijah Newren | sparse-checkout: avoid staging deletions of all files Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-05-31 |
Elijah Newren | fast-import: add new --date-format=raw-permissive format Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-05-15 |
Elijah Newren | unpack-trees: also allow get_progress() to work on... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-05-14 |
Elijah Newren | merge-recursive: fix rename/rename(1to2) for working... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-27 |
Elijah Newren | rebase: display an error if --root and --fork-point... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-11 |
Elijah Newren | rebase: fix an incompatible-options error message Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-11 |
Elijah Newren | rebase: reinstate --no-keep-empty Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-11 |
Elijah Newren | rebase -i: mark commits that begin empty in todo editor Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-07 |
Elijah Newren | sequencer: honor GIT_REFLOG_ACTION Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-05 |
Elijah Newren | git-rebase.txt: add another hook to the hooks section... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | completion: fix 'git add' on paths under an untracked... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | Fix error-prone fill_directory() API; make it only... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | dir: replace double pathspec matching with single in... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | dir: replace exponential algorithm with a linear one Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | dir: fix confusion based on variable tense Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | dir: fix broken comment Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | dir: consolidate treat_path() and treat_one_path() Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | dir: fix simple typo in comment Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | t3000: add more testcases testing a variety of ls-files... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-04-01 |
Elijah Newren | t7063: more thorough status checking Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | pull: avoid running both merge and rebase Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | sparse-checkout: provide a new reapply subcommand Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: failure to set SKIP_WORKTREE bits always... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: provide warnings on sparse updates for... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: make sparse path messages sound like... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: split display_error_msgs() into two Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: rename ERROR_* fields meant for warnings... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | sparse-checkout: use improved unpack_trees porcelain... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | sparse-checkout: use new update_sparsity() function Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: add a new update_sparsity() function Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: pull sparse-checkout pattern reading... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: do not mark a dirty path with SKIP_WORKTREE Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: allow check_updates() to work on a different... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | t1091: make some tests a little more defensive against... Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: simplify pattern_list freeing Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: simplify verify_absent_sparse() Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: remove unused error type Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-27 |
Elijah Newren | unpack-trees: fix minor typo in comment Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-18 |
Elijah Newren | RelNotes/2.26.0: fix various typos Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-15 |
Elijah Newren | oidset: remove unnecessary include Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
2020-03-13 |
Elijah Newren | t6022, t6046: fix flaky files-are-updated checks Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
next |