Steffen Prohaska schrieb: > On Apr 17, 2008, at 12:02 AM, Stephan Hennig wrote: >> >> Symptoms: >> 1. The editor now opens again with an empty file named [EMAIL PROTECTED] >> 2. After git-rebase is finished there remains a dangling file $@ in >> the >> working copy. > > I cannot reproduce the behavior you describe. Could you send a more > detailed test case?
I can reproduce it with different repositories. > A sequence of simple commands that starts from a > freshly initialized repository would be best. Something like: Ok, attached is a short script that initializes a new repository, makes three commits and then calls git rebase -i to melt the last two commits. Additionally, I've found another symptom that is probably caused by this bug. Receipe: 1. Run the attached script bug-rebase-i. 2. (Editor opens.) Squash the last commit. 3. Save file. 4. Exit editor. 5. (Editor opens with empty file @$.) Type "melted commit". 6. Save file. 7. Exit editor. 8. (Git does rebasing.) 9. (Git shows log message of the melted commit.) Symptoms: 1. The file opened for choosing a new commit message is empty. 2. After git-rebase is finished there remains a dangling file $@ in the working copy. 3. The commit message of the melted commit is not melted commit but 2 3 That is, the newly typed-in commit message had been discarded and both old commit messages were appended to form the new commit message. System: $ git version git version 1.5.5.1015.g9d258 Git was installed to run from Msys shell only. Best regards, Stephan Hennig
#!/bin/sh mkdir bug-rebase-i-dir cd bug-rebase-i-dir git init echo "1" >> a git add a git commit -m "1" echo "2" >> a git add a git commit -m "2" echo "3" >> a git add a git commit -m "3" git rebase -i HEAD~2 git log -1
