code clean-up for rerere
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest4 patches 0 repliesNew
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | rerere: simplify check_one_conflict() helper functionrerere.c | +15 | 0 replies | |
| 2/4 | rerere: fix comment on handle_file() helperrerere.c | +1 | 0 replies | |
| 3/4 | rerere: try_merge() should use LL_MERGE_ERROR when it means an errorrerere.c | +1 | 0 replies | |
| 4/4 | rerere: modernize use of empty strbufrerere.c | +2 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/4] code clean-up for rerere
These are to clean up some odd code and in-code comment that invited "Huh?" while I was reviewing the code paths involved in "git rerere" recently. None of them is intended to change any behaviour.
Junio C Hamano (4):
rerere: simplify check_one_conflict() helper function
rerere: fix comment on handle_file() helper
rerere: try_merge() should use LL_MERGE_ERROR when it means an error
rerere: modernize use of empty strbuf
rerere.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-)
Signature · 1 line
2.42.0-29-gcd9da15a85