From: Elijah Newren <newren@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Johannes.Schindelin@gmx.de,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 0/5] merge-recursive code cleanups
Date: Mon, 21 May 2018 17:43:22 -0700 [thread overview]
Message-ID: <20180522004327.13085-1-newren@gmail.com> (raw)
In-Reply-To: <20180519020700.2241-1-newren@gmail.com>
This patch series contains several small code cleanups for merge-recursive.
I have removed a couple small cleanup chunks in order to avoid conflicts
with any other in-flight topics in pu (namely, nd/commit-util-to-slab and
sb/submodule-merge-in-merge-recursive). I may resend those later
separately.
The series was made on top of next (specifically commit 4fb28f7b1639
("Merge branch 'sb/object-store-replace' into next")); it will not
apply to master.
Changes since v1:
* As suggested by Dscho, replaced patch 5 with a pointer about the
fact that the code is that way to help translators
* Small rewordings or paragraph splittings suggested by Dscho
* Added Dscho's Acked-by on relevant patches (2-4)
Elijah Newren (5):
merge-recursive: fix miscellaneous grammar error in comment
merge-recursive: fix numerous argument alignment issues
merge-recursive: clarify the rename_dir/RENAME_DIR meaning
merge-recursive: rename conflict_rename_*() family of functions
merge-recursive: add pointer about unduly complex looking code
merge-recursive.c | 152 ++++++++++++++++++++++++++--------------------
1 file changed, 87 insertions(+), 65 deletions(-)
branch-diff:
1: 1af1c7df17 = 1: 96225eddbb merge-recursive: fix miscellaneous grammar error in comment
2: 8ed7c8b588 ! 2: c63f72e96d merge-recursive: fix numerous argument alignment issues
@@ -5,6 +5,7 @@
Various refactorings throughout the code have left lots of alignment
issues that were driving me crazy; fix them.
+ Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
diff --git a/merge-recursive.c b/merge-recursive.c
3: e96b2cd9ae ! 3: 3d95e8b756 merge-recursive: clarify the rename_dir/RENAME_DIR meaning
@@ -4,14 +4,17 @@
We had an enum of rename types which included RENAME_DIR; this name felt
misleading since it was not about an entire directory but was a status for
- each individual file add that occurred within a renamed directory. Since
- this type is for signifying that the files in question were being renamed
- due to directory rename detection, rename this enum value to
- RENAME_VIA_DIR. Make a similar change to the conflict_rename_dir()
- function, and add a comment to the top of that function explaining its
- purpose (it may not be quite as obvious as for the other
- conflict_rename_*() functions).
+ each individual file add that occurred within a renamed directory.
+ Since this type is for signifying that the files in question were being
+ renamed due to directory rename detection, rename this enum value to
+ RENAME_VIA_DIR.
+
+ Make a similar change to the conflict_rename_dir() function, and add a
+ comment to the top of that function explaining its purpose (it may not be
+ quite as obvious as for the other conflict_rename_*() functions).
+
+ Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -42,7 +45,7 @@
+ /*
+ * Handle file adds that need to be renamed due to directory rename
+ * detection. This differs from handle_rename_normal, because
-+ * there is no content merge to do; just move the path into the
++ * there is no content merge to do; just move the file into the
+ * desired final location.
+ */
const struct diff_filespec *dest = pair->two;
4: 4155613a6b ! 4: dfd6ab22db merge-recursive: rename conflict_rename_*() family of functions
@@ -24,6 +24,7 @@
from all the handle_rename_*() functions which are called from
process_entry().
+ Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
diff --git a/merge-recursive.c b/merge-recursive.c
5: 20b8963732 < --: ---------- merge-recursive: simplify handle_change_delete
--: ---------- > 5: 122629ef7a merge-recursive: add pointer about unduly complex looking code
--
2.17.0.847.g20b8963732
next prev parent reply other threads:[~2018-05-22 0:43 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-19 2:06 [PATCH 0/5] merge-recursive code cleanups Elijah Newren
2018-05-19 2:06 ` [PATCH 1/5] merge-recursive: fix miscellaneous grammar error in comment Elijah Newren
2018-05-19 2:06 ` [PATCH 2/5] merge-recursive: fix numerous argument alignment issues Elijah Newren
2018-05-21 13:42 ` Johannes Schindelin
2018-05-21 16:48 ` Elijah Newren
2018-05-19 2:06 ` [PATCH 3/5] merge-recursive: clarify the rename_dir/RENAME_DIR meaning Elijah Newren
2018-05-21 14:28 ` Johannes Schindelin
2018-05-19 2:06 ` [PATCH 4/5] merge-recursive: rename conflict_rename_*() family of functions Elijah Newren
2018-05-21 14:30 ` Johannes Schindelin
2018-05-19 2:07 ` [PATCH 5/5] merge-recursive: simplify handle_change_delete Elijah Newren
2018-05-19 7:32 ` Johannes Sixt
2018-05-19 15:39 ` Elijah Newren
2018-05-21 13:41 ` Johannes Schindelin
2018-05-21 17:22 ` Elijah Newren
2018-05-22 0:43 ` Elijah Newren [this message]
2018-05-22 0:43 ` [PATCH v2 1/5] merge-recursive: fix miscellaneous grammar error in comment Elijah Newren
2018-05-22 0:43 ` [PATCH v2 2/5] merge-recursive: fix numerous argument alignment issues Elijah Newren
2018-05-22 0:43 ` [PATCH v2 3/5] merge-recursive: clarify the rename_dir/RENAME_DIR meaning Elijah Newren
2018-05-22 0:43 ` [PATCH v2 4/5] merge-recursive: rename conflict_rename_*() family of functions Elijah Newren
2018-05-22 0:43 ` [PATCH v2 5/5] merge-recursive: add pointer about unduly complex looking code Elijah Newren
2018-06-10 4:16 ` [PATCH v3 0/6] merge-recursive code cleanups Elijah Newren
2018-06-10 4:16 ` [PATCH v3 1/6] merge-recursive: fix miscellaneous grammar error in comment Elijah Newren
2018-06-10 4:16 ` [PATCH v3 2/6] merge-recursive: fix numerous argument alignment issues Elijah Newren
2018-06-10 4:16 ` [PATCH v3 3/6] merge-recursive: align labels with their respective code blocks Elijah Newren
2018-06-10 4:16 ` [PATCH v3 4/6] merge-recursive: clarify the rename_dir/RENAME_DIR meaning Elijah Newren
2018-06-10 4:16 ` [PATCH v3 5/6] merge-recursive: rename conflict_rename_*() family of functions Elijah Newren
2018-06-10 4:16 ` [PATCH v3 6/6] merge-recursive: add pointer about unduly complex looking code Elijah Newren
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180522004327.13085-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).