diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-16 11:18:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-16 11:18:55 -0700 |
| commit | ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026 (patch) | |
| tree | 5a13b0c039ecdb3403a52c9278ad35de0cd33e11 /t/unit-tests/t-oidtree.c | |
| parent | ad850ef1cf1b4af1c1fa3ed8f79e48b8273aa557 (diff) | |
| parent | fcf59ac1363493c4aab6de8547a28a8dd148871e (diff) | |
| download | git-ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026.tar.gz | |
Merge branch 'en/ort-inner-merge-error-fix'
The "ort" merge backend saw one bugfix for a crash that happens
when inner merge gets killed, and assorted code clean-ups.
* en/ort-inner-merge-error-fix:
merge-ort: fix missing early return
merge-ort: convert more error() cases to path_msg()
merge-ort: upon merge abort, only show messages causing the abort
merge-ort: loosen commented requirements
merge-ort: clearer propagation of failure-to-function from merge_submodule
merge-ort: fix type of local 'clean' var in handle_content_merge ()
merge-ort: maintain expected invariant for priv member
merge-ort: extract handling of priv member into reusable function
Diffstat (limited to 't/unit-tests/t-oidtree.c')
0 files changed, 0 insertions, 0 deletions