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@xxxxxx>
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
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@xxxxxx>
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
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@xxxxxx>
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
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
