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

Possible git bug

From
DLDamon LaCrosse <arid@inbox.ru>
Date
Jan 17, 2009, 13:52 UTC
Message-ID
<87zlhqca4m.fsf@inbox.ru>
HiQ,
any chances the attached patch reveals a git bug?
Cheers,

diff -Nru old/git-bug.sh new/git-bug.sh --- old/git-bug.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/git-bug.sh 2008-09-16 09:52:18.000000000 +0200

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+mkdir bug
+cd bug
+git init-db
+
+echo one > file1
+git add file1
+echo "Bug Test Example" | git commit --all -F -
+
+git checkout -b branch
+echo two >> file1
+echo "Branch modification" | git commit --all -F -
+
+git checkout master
+git mv file1 file2
+
+echo "Master rename" | git commit --all -F -
+
+echo three >> file2
+
+echo "Master modification" | git commit --all -F -
+
+git merge -s recursive branch
Next: Johannes Schindelin
Message 1 of 2 in “Possible git bug”
  1. Damon LaCrosseJan 17, 2009
  2. Johannes SchindelinJan 17, 2009

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.