{"thread":{"id":"60369","subject":"[PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","startedAt":"2023-10-15T14:08:53Z","lastAt":"2023-10-22T02:46:12Z","messageCount":3,"participants":["Wangchangxin via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"483285","messageId":"pull.1592.git.git.1697378928693.gitgitgadget@gmail.com","threadId":"60369","inReplyTo":null,"subject":"[PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"Wangchangxin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-15T14:08:48Z","receivedAt":"2023-10-15T14:08:53Z","isPatch":true,"sender":{"key":"name:Wangchangxin","avatar":null},"body":"From: foril <1571825323@qq.com>\n\nSigned-off-by: 王常新 (Wang Changxin) \n---\n typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…\n \n the comments on line 2039 under merge-ort.c should be :\n this is needed if we have content merges of content merges rather than\n this is neeed if we have content merges of content merges\n \n fix the typo\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1592%2FforiLLL%2Fcomment_patch-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v1\nPull-Request: https://github.com/git/git/pull/1592\n\n merge-ort.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/merge-ort.c b/merge-ort.c\nindex 7857ce9fbd1..aee6f7d8173 100644\n--- a/merge-ort.c\n+++ b/merge-ort.c\n@@ -2036,7 +2036,7 @@ static int handle_content_merge(struct merge_options *opt,\n \t * the three blobs to merge on various sides of history.\n \t *\n \t * extra_marker_size is the amount to extend conflict markers in\n-\t * ll_merge; this is neeed if we have content merges of content\n+\t * ll_merge; this is needed if we have content merges of content\n \t * merges, which happens for example with rename/rename(2to1) and\n \t * rename/add conflicts.\n \t */\n\nbase-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed\n-- \ngitgitgadget\n"},{"id":"483485","messageId":"pull.1592.v2.git.git.1697719216137.gitgitgadget@gmail.com","threadId":"60369","inReplyTo":"pull.1592.git.git.1697378928693.gitgitgadget@gmail.com","subject":"[PATCH v2] merge-ort.c: fix typo 'neeed' to 'needed'","fromName":"Wangchangxin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-19T12:40:15Z","receivedAt":"2023-10-19T12:40:21Z","isPatch":true,"sender":{"key":"name:Wangchangxin","avatar":null},"body":"From: foril <1571825323@qq.com>\n\nSigned-off-by: 王常新 (Wang Changxin) \n---\n typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…\n \n the comments on line 2039 under merge-ort.c should be :\n this is needed if we have content merges of content merges rather than\n this is neeed if we have content merges of content merges\n \n fix the typo\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1592%2FforiLLL%2Fcomment_patch-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v2\nPull-Request: https://github.com/git/git/pull/1592\n\nRange-diff vs v1:\n\n 1: 737eccd2811 ! 1: 3934ee6b684 typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c\n @@ Metadata\n Author: foril <1571825323@qq.com>\n \n ## Commit message ##\n - typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c\n + merge-ort.c: fix typo 'neeed' to 'needed'\n \n Signed-off-by: 王常新 (Wang Changxin) \n \n\n\n merge-ort.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/merge-ort.c b/merge-ort.c\nindex 7857ce9fbd1..aee6f7d8173 100644\n--- a/merge-ort.c\n+++ b/merge-ort.c\n@@ -2036,7 +2036,7 @@ static int handle_content_merge(struct merge_options *opt,\n \t * the three blobs to merge on various sides of history.\n \t *\n \t * extra_marker_size is the amount to extend conflict markers in\n-\t * ll_merge; this is neeed if we have content merges of content\n+\t * ll_merge; this is needed if we have content merges of content\n \t * merges, which happens for example with rename/rename(2to1) and\n \t * rename/add conflicts.\n \t */\n\nbase-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed\n-- \ngitgitgadget\n"},{"id":"483627","messageId":"pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com","threadId":"60369","inReplyTo":"pull.1592.v2.git.git.1697719216137.gitgitgadget@gmail.com","subject":"[PATCH v3] merge-ort.c: fix typo 'neeed' to 'needed'","fromName":"Wangchangxin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-22T02:46:08Z","receivedAt":"2023-10-22T02:46:12Z","isPatch":true,"sender":{"key":"name:Wangchangxin","avatar":null},"body":"From: =?UTF-8?q?=E7=8E=8B=E5=B8=B8=E6=96=B0?= \n\nSigned-off-by: 王常新 (Wang Changxin) \n---\n typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…\n \n the comments on line 2039 under merge-ort.c should be :\n this is needed if we have content merges of content merges rather than\n this is neeed if we have content merges of content merges\n \n fix the typo\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1592%2FforiLLL%2Fcomment_patch-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v3\nPull-Request: https://github.com/git/git/pull/1592\n\nRange-diff vs v2:\n\n 1: 3934ee6b684 ! 1: 9320154b91a merge-ort.c: fix typo 'neeed' to 'needed'\n @@\n ## Metadata ##\n -Author: foril <1571825323@qq.com>\n +Author: 王常新 \n \n ## Commit message ##\n merge-ort.c: fix typo 'neeed' to 'needed'\n \n - Signed-off-by: 王常新 (Wang Changxin) \n + Signed-off-by: 王常新 (Wang Changxin) \n \n ## merge-ort.c ##\n @@ merge-ort.c: static int handle_content_merge(struct merge_options *opt,\n\n\n merge-ort.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/merge-ort.c b/merge-ort.c\nindex 7857ce9fbd1..aee6f7d8173 100644\n--- a/merge-ort.c\n+++ b/merge-ort.c\n@@ -2036,7 +2036,7 @@ static int handle_content_merge(struct merge_options *opt,\n \t * the three blobs to merge on various sides of history.\n \t *\n \t * extra_marker_size is the amount to extend conflict markers in\n-\t * ll_merge; this is neeed if we have content merges of content\n+\t * ll_merge; this is needed if we have content merges of content\n \t * merges, which happens for example with rename/rename(2to1) and\n \t * rename/add conflicts.\n \t */\n\nbase-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed\n-- \ngitgitgadget\n"}]}