[PATCH] merge-recursive: remove superfluous semicolon

From

Elijah Newren <newren@gmail.com>

Date

Sep 5, 2018, 16:47 UTC

Message-ID

<20180905164753.22711-1-newren@gmail.com>

Signed-off-by: Elijah Newren <newren@gmail.com>
---
Once I saw it, I couldn't unsee it, and it quickly started getting on my
nerves...  My bad for not noticing it when reviewing the original patch
that introduced it, I guess -- 9da2d0379ea0 ("merge-recursive: use
xstrdup() instead of fixed buffer", 2018-06-10)

 merge-recursive.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index e5243dbc54..1b5c255918 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2239,7 +2239,7 @@ static struct dir_rename_entry *check_dir_renamed(const char *path,
 {
 	char *temp = xstrdup(path);
 	char *end;
-	struct dir_rename_entry *entry = NULL;;
+	struct dir_rename_entry *entry = NULL;
 
 	while ((end = strrchr(temp, '/'))) {
 		*end = '\0';

-- 
2.19.0.rc2.1.g7fc77f67e1