{"thread":{"id":"4817","subject":"[PATCH] Fix some doubled word typos","startedAt":"2006-07-09T09:36:23Z","lastAt":"2006-07-10T02:04:43Z","messageCount":6,"participants":["Alp Toker","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"23461","messageId":"11524377844177-git-send-email-alp@atoker.com","threadId":"4817","inReplyTo":null,"subject":"[PATCH] Fix some doubled word typos","fromName":"Alp Toker","fromEmail":"alp@atoker.com","sentAt":"2006-07-09T09:36:23Z","receivedAt":"2006-07-09T09:36:23Z","isPatch":true,"sender":{"key":"alp@atoker.com","avatar":"https://gravatar.com/avatar/5367b73f1bb2598314e084847e4f45c303514c7fd192cfa9aa3c3437511567cd?d=mp&s=160"},"body":"Signed-off-by: Alp Toker \n---\n Documentation/git-svn.txt | 2 +-\n Documentation/urls.txt | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex f7d3de4..7d86809 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -224,7 +224,7 @@ Merge tracking in Subversion is lacking \n with Subversion is cumbersome as a result. git-svn completely forgoes\n any automated merge/branch tracking on the Subversion side and leaves it\n entirely up to the user on the git side. It's simply not worth it to do\n-a useful translation when the the original signal is weak.\n+a useful translation when the original signal is weak.\n \n TRACKING MULTIPLE REPOSITORIES OR BRANCHES\n ------------------------------------------\ndiff --git a/Documentation/urls.txt b/Documentation/urls.txt\nindex 7477413..d60b371 100644\n--- a/Documentation/urls.txt\n+++ b/Documentation/urls.txt\n@@ -47,7 +47,7 @@ Then such a short-hand is specified in p\n without parameters on the command\n line, specified on `Push:` lines or `Pull:`\n lines are used for `git-push` and `git-fetch`/`git-pull`,\n-respectively. Multiple `Push:` and and `Pull:` lines may\n+respectively. Multiple `Push:` and `Pull:` lines may\n be specified for additional branch mappings.\n \n The name of a file in `$GIT_DIR/branches` directory can be\n-- \n1.4.1.gbe4c7\n"},{"id":"23462","messageId":"11524377843467-git-send-email-alp@atoker.com","threadId":"4817","inReplyTo":"11524377844177-git-send-email-alp@atoker.com","subject":"[PATCH] Fix typos involving the word 'commit'","fromName":"Alp Toker","fromEmail":"alp@atoker.com","sentAt":"2006-07-09T09:36:24Z","receivedAt":"2006-07-09T09:36:24Z","isPatch":true,"sender":{"key":"alp@atoker.com","avatar":"https://gravatar.com/avatar/5367b73f1bb2598314e084847e4f45c303514c7fd192cfa9aa3c3437511567cd?d=mp&s=160"},"body":"Signed-off-by: Alp Toker \n---\n Documentation/git-cvsexportcommit.txt | 2 +-\n refs.c | 12 ++++++------\n 2 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt\nindex 56bd3e5..27ac72d 100644\n--- a/Documentation/git-cvsexportcommit.txt\n+++ b/Documentation/git-cvsexportcommit.txt\n@@ -8,7 +8,7 @@ git-cvsexportcommit - Export a commit to\n \n SYNOPSIS\n --------\n-'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID\n+'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID\n \n \n DESCRIPTION\ndiff --git a/refs.c b/refs.c\nindex 713ca46..2d9c1dc 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -362,7 +362,7 @@ static int log_ref_write(struct ref_lock\n \tint logfd, written, oflags = O_APPEND | O_WRONLY;\n \tunsigned maxlen, len;\n \tchar *logrec;\n-\tconst char *comitter;\n+\tconst char *committer;\n \n \tif (log_all_ref_updates) {\n \t\tif (safe_create_leading_directories(lock->log_file) < 0)\n@@ -380,23 +380,23 @@ static int log_ref_write(struct ref_lock\n \t}\n \n \tsetup_ident();\n-\tcomitter = git_committer_info(1);\n+\tcommitter = git_committer_info(1);\n \tif (msg) {\n-\t\tmaxlen = strlen(comitter) + strlen(msg) + 2*40 + 5;\n+\t\tmaxlen = strlen(committer) + strlen(msg) + 2*40 + 5;\n \t\tlogrec = xmalloc(maxlen);\n \t\tlen = snprintf(logrec, maxlen, \"%s %s %s\\t%s\\n\",\n \t\t\tsha1_to_hex(lock->old_sha1),\n \t\t\tsha1_to_hex(sha1),\n-\t\t\tcomitter,\n+\t\t\tcommitter,\n \t\t\tmsg);\n \t}\n \telse {\n-\t\tmaxlen = strlen(comitter) + 2*40 + 4;\n+\t\tmaxlen = strlen(committer) + 2*40 + 4;\n \t\tlogrec = xmalloc(maxlen);\n \t\tlen = snprintf(logrec, maxlen, \"%s %s %s\\n\",\n \t\t\tsha1_to_hex(lock->old_sha1),\n \t\t\tsha1_to_hex(sha1),\n-\t\t\tcomitter);\n+\t\t\tcommitter);\n \t}\n \twritten = len <= maxlen ? write(logfd, logrec, len) : -1;\n \tfree(logrec);\n-- \n1.4.1.gbe4c7\n"},{"id":"23506","messageId":"44B1A01F.5090408@atoker.com","threadId":"4817","inReplyTo":"11524377844177-git-send-email-alp@atoker.com","subject":"Re: [PATCH] Fix some doubled word typos","fromName":"Alp Toker","fromEmail":"alp@atoker.com","sentAt":"2006-07-10T00:32:31Z","receivedAt":"2006-07-10T00:32:31Z","isPatch":true,"sender":{"key":"alp@atoker.com","avatar":"https://gravatar.com/avatar/5367b73f1bb2598314e084847e4f45c303514c7fd192cfa9aa3c3437511567cd?d=mp&s=160"},"body":"Alp Toker wrote:\n> Signed-off-by: Alp Toker \n> ---\n> Documentation/git-svn.txt | 2 +-\n> Documentation/urls.txt | 2 +-\n> 2 files changed, 2 insertions(+), 2 deletions(-)\n\nMy patch was made against the 'next' branch, where the file had recently \nbeen moved to Documentation/git-svn.txt, but it was applied to the \n'master' branch where the file still exists at \ncontrib/git-svn/git-svn.txt as it has not yet been moved.\n\nAs a result, it seems that only the modification to \nDocumentation/urls.txt in this patch made it into the repository, with \nthe fix to Documentation/git-svn.txt having been silently omitted.\n\nBy the time the commit was merged from 'master' to 'next', it had \npermanently lost the modification to git-svn.txt, and even though the \ncommit message claims to \"Fix some doubled word typos\" it only fixes one.\n\nCould this situation have been avoided if the patch had mentioned that \nit was against the 'next' branch? Should/does git warn the user if a \npatch modifies files that don't exist? Would rename tracking have helped \nthis patch to apply properly?\n"},{"id":"23508","messageId":"7vodvye10h.fsf@assigned-by-dhcp.cox.net","threadId":"4817","inReplyTo":"44B1A01F.5090408@atoker.com","subject":"Re: [PATCH] Fix some doubled word typos","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-10T00:50:38Z","receivedAt":"2006-07-10T00:50:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alp Toker writes:\n\n> My patch was made against the 'next' branch, where the file had\n> recently been moved to Documentation/git-svn.txt, but it was applied\n> to the 'master' branch where the file still exists at\n> contrib/git-svn/git-svn.txt as it has not yet been moved.\n\nActually, I am a bit more careful than that ;-).\n\nI have split your patch into two, and applied the part that\napplicable to \"master\" first. The tip of ew/svn topic branch (I\ndo not publish topic branch tips) have two patches that are\nstill not in even \"pu\", and one of these two patches is your\nDocumentation/git-svn.txt patch. These two will appear in\n\"next\" hopefully soon -- I just haven't gotten around to them.\n"},{"id":"23509","messageId":"44B1B093.9000201@atoker.com","threadId":"4817","inReplyTo":"7vodvye10h.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Fix some doubled word typos","fromName":"Alp Toker","fromEmail":"alp@atoker.com","sentAt":"2006-07-10T01:42:43Z","receivedAt":"2006-07-10T01:42:43Z","isPatch":true,"sender":{"key":"alp@atoker.com","avatar":"https://gravatar.com/avatar/5367b73f1bb2598314e084847e4f45c303514c7fd192cfa9aa3c3437511567cd?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> Actually, I am a bit more careful than that ;-).\n> \n> I have split your patch into two, and applied the part that\n> applicable to \"master\" first. The tip of ew/svn topic branch (I\n> do not publish topic branch tips) have two patches that are\n> still not in even \"pu\", and one of these two patches is your\n> Documentation/git-svn.txt patch. These two will appear in\n> \"next\" hopefully soon -- I just haven't gotten around to them.\n\nI hadn't realised that git-svn work was happening on a topic branch. In \nlight of that, it makes perfect sense to split out the commit as you \ndid. It's good to hear that git isn't just truncating patches.\n\nCheers.\n"},{"id":"23510","messageId":"7vk66mdxl0.fsf@assigned-by-dhcp.cox.net","threadId":"4817","inReplyTo":"44B1B093.9000201@atoker.com","subject":"Re: [PATCH] Fix some doubled word typos","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-10T02:04:43Z","receivedAt":"2006-07-10T02:04:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alp Toker writes:\n\n> I hadn't realised that git-svn work was happening on a topic\n> branch. In light of that, it makes perfect sense to split out the\n> commit as you did. It's good to hear that git isn't just truncating\n> patches.\n\nNo, what would happen (if I were not careful) if I try to apply\nit to \"master\" would be that \"git am\" would refuse to touch any\nfile. IOW, it tries to apply the patches atomically. Not\ntruncating or omitting patches is one of the most important\nthings git needs to do correctly so it had better work right\n;-).\n"}]}