From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 0/4] code clean-up for rerere
Date: Thu, 24 Aug 2023 13:54:52 -0700 [thread overview]
Message-ID: <20230824205456.1231371-1-gitster@pobox.com> (raw)
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(-)
--
2.42.0-29-gcd9da15a85
next reply other threads:[~2023-08-24 20:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 20:54 Junio C Hamano [this message]
2023-08-24 20:54 ` [PATCH 1/4] rerere: simplify check_one_conflict() helper function Junio C Hamano
2023-08-24 20:54 ` [PATCH 2/4] rerere: fix comment on handle_file() helper Junio C Hamano
2023-08-24 20:54 ` [PATCH 3/4] rerere: try_merge() should use LL_MERGE_ERROR when it means an error Junio C Hamano
2023-08-24 20:54 ` [PATCH 4/4] rerere: modernize use of empty strbuf Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230824205456.1231371-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).