Hi folks, I have checked out a remote git repo. I have hacked on my local copy for the last two days. I have performed no merges or anything elese odd. Today I git fetched the remote, and then I tried to git rebase upstream/master. I had committed all outstanding changes first. My index was clean. It displayed: First, rewinding head to replay your work on top of it... HEAD is now at 77f1a60... Merge branch 'trunk' Dirty index: cannot apply patches (dirty: public/dispatch.fcgi) Tthat particular file was one that I added. It did not exist upstream either at my initial checkout, nor was it added upstream at any point since. git status shows: # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: public/dispatch.fcgi # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .dotest/ So I tried the git reset command on public/dispatch.fcgi, and also then deleted that file. I then tried git-rebase --continue, which displayed: sed: can't read .dotest/info: No such file or directory sed: can't read .dotest/info: No such file or directory sed: can't read .dotest/info: No such file or directory Patch does not have a valid e-mail address. I have no idea what sed is complaining about, but that last line is interesting. The upstream git repo I am monitoring was itself converted from an svn repo using, presumably, git-svn or git-svnimport. It lies at git://gitorious.org/redmine-git/mainline.git Most patches have an author like this: Author: jplang <jplang@e93f8b46-1217-0410-a6f0-8f06a7374b81> Could one of the git tools be trying to parse this for some odd reason? Or is something else going on here? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
