Some small fixes to merge-recursive and tests
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest3 patches 3 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | Tighten and correct a few testcases for merging and cherry-pickingt/ t/ | +9 | 1 reply | |
| 2/3 | merge-recursive: fix logic ordering issuemerge-recursive.c | +1 | 1 reply | |
| 3/3 | merge-recursive: add explanation for src_entry and dst_entrymerge-recursive.c | +19 | 1 reply |
Reviews trailers per patch
All 3 patches have a Reviewed-by or Acked-by.
| Patch | Stefan Beller |
|---|---|
| 1/3 | R-b |
| 2/3 | R-b |
| 3/3 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 0/3] Some small fixes to merge-recursive and tests
These three patches were the first three from en/rename-directory-detection[1], but as Stefan suggested[2], I'm submitting them separately as they are independent fixes.
Change from PATCHv5-rename-directory-detection:
* Split from the rest of the series.
* Added Stefan's Reviewed-By.
[1] https://public-inbox.org/git/[email protected]/
[2] https://public-inbox.org/git/CAGZ79kapuEKLO4RUUPVS6_-aeBERDhjpBAtmK=gycT8GaK2bFg@mail.gmail.com/
Elijah Newren (3):
Tighten and correct a few testcases for merging and cherry-picking
merge-recursive: fix logic ordering issue
merge-recursive: add explanation for src_entry and dst_entry
merge-recursive.c | 21 ++++++++++++++++++++- t/t3501-revert-cherry-pick.sh | 7 +++++-- t/t7607-merge-overwrite.sh | 5 ++++- 3 files changed, 29 insertions(+), 4 deletions(-)
Signature · 1 line
2.14.2