git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Fix some doubled word typos

From
Alp Toker <alp@atoker.com>
Date
Jul 10, 2006, 00:32 UTC
Message-ID
<44B1A01F.5090408@atoker.com>
In-Reply-To
<11524377844177-git-send-email-alp@atoker.com>
Alp Toker wrote:
Show 5 quoted lines
> Signed-off-by: Alp Toker <alp@atoker.com>
> ---
>  Documentation/git-svn.txt |    2 +-
>  Documentation/urls.txt    |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

My patch was made against the 'next' branch, where the file had recently been moved to Documentation/git-svn.txt, but it was applied to the 'master' branch where the file still exists at contrib/git-svn/git-svn.txt as it has not yet been moved.

As a result, it seems that only the modification to Documentation/urls.txt in this patch made it into the repository, with the fix to Documentation/git-svn.txt having been silently omitted.

By the time the commit was merged from 'master' to 'next', it had permanently lost the modification to git-svn.txt, and even though the commit message claims to "Fix some doubled word typos" it only fixes one.

Could this situation have been avoided if the patch had mentioned that it was against the 'next' branch? Should/does git warn the user if a patch modifies files that don't exist? Would rename tracking have helped this patch to apply properly?

Previous: Alp TokerNext: Junio C Hamano
Message 3 of 6 in “Fix some doubled word typos”
  1. Fix some doubled word typosAlp Toker, Jul 9, 2006
  2. Fix typos involving the word 'commit'Alp Toker, Jul 9, 2006
  3. Alp TokerJul 10, 2006
  4. Junio C HamanoJul 10, 2006
  5. Alp TokerJul 10, 2006
  6. Junio C HamanoJul 10, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.