From: Damon LaCrosse <arid@inbox.ru>
To: git@vger.kernel.org
Subject: Possible git bug
Date: Sat, 17 Jan 2009 14:52:57 +0100 [thread overview]
Message-ID: <87zlhqca4m.fsf@inbox.ru> (raw)
[-- Attachment #1: Type: text/plain, Size: 66 bytes --]
HiQ,
any chances the attached patch reveals a git bug?
Cheers,
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: git-bug.patch --]
[-- Type: text/x-patch, Size: 596 bytes --]
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 reply other threads:[~2009-01-17 14:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-17 13:52 Damon LaCrosse [this message]
2009-01-17 15:16 ` Possible git bug Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2013-08-14 4:50 Hugh Davenport
2013-08-14 5:42 ` Daniel Knittl-Frank
2013-08-14 6:53 ` Jeff King
2021-09-16 3:29 Wesley Schwengle
2021-09-16 5:37 ` Taylor Blau
2021-09-16 12:07 ` Wesley Schwengle
2021-09-16 12:47 ` wesley
2021-09-16 15:33 ` Junio C Hamano
2021-09-16 19:39 ` Wesley Schwengle
2021-09-16 21:52 ` Junio C Hamano
2021-09-16 22:30 ` Wesley Schwengle
2021-09-16 21:21 [PATCH] Document `rebase.forkpoint` in rebase man page Junio C Hamano
2021-09-16 22:35 ` Possible git bug wesley
2021-09-16 22:46 ` wesley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zlhqca4m.fsf@inbox.ru \
--to=arid@inbox.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.