Hello,
Here is a pastebin where I've reproduced the steps on a clean git repo.
http://pastebin.com/0vQZEat0
Brief description of the problem:
1.Basically one creates a local branch call it 'imp_fix' (branch off master --> this doesn't matter) 2.One does work, commit, etc 3.One rebases imp_fix with master via: (inside imp_fix) git rebase master 4.One checks out master via: git checkout master 5.One merges an incorrect name "imp_Fix" (notice the capital F) 6.The expected output is that git would say, silly you --> that branch does not exist. 7. Instead it merges (what I think is incorrectly) imp_fix.
Kindly let me know if I can provide more details.
For your convenience here is the paste:
agallego@agallego-macpro.local] /tmp $ git clone git@bitbucket.org/agallego/gitbug Cloning into 'gitbug'... warning: You appear to have cloned an empty repository.
[agallego@agallego-macpro.local] /tmp $ cd gitbug
[agallego@agallego-macpro.local] /tmp/gitbug $ ls
[agallego@agallego-macpro.local] /tmp/gitbug $ echo "Trying to reproduce a bug" > README
[agallego@agallego-macpro.local] /tmp/gitbug $ ls README
[agallego@agallego-macpro.local] /tmp/gitbug $ git add .
[agallego@agallego-macpro.local] /tmp/gitbug $ git commit -am "adding readme" [master (root-commit) 0bfd62a] adding readme 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 README
[agallego@agallego-macpro.local] /tmp/gitbug $ git push origin master Counting objects: 3, done. Writing objects: 100% (3/3), 230 bytes, done. Total 3 (delta 0), reused 0 (delta 0) remote: bb/acl: agallego is allowed. accepted payload. To git@bitbucket.org:agallego/gitbug * [new branch] master -> master
[agallego@agallego-macpro.local] /tmp/gitbug $ git checkout imp_fix error: pathspec 'imp_fix' did not match any file(s) known to git.
[agallego@agallego-macpro.local] /tmp/gitbug $ git branch imp_fix
[agallego@agallego-macpro.local] /tmp/gitbug $ git checkout imp_fix Switched to branch 'imp_fix'
[agallego@agallego-macpro.local] /tmp/gitbug $ echo "imp_fix" >> README
[agallego@agallego-macpro.local] /tmp/gitbug $ git commit -am "step 2, create an imp_fix branch and then merge" [imp_fix 178c8f3] step 2, create an imp_fix branch and then merge 1 files changed, 1 insertions(+), 0 deletions(-)
[agallego@agallego-macpro.local] /tmp/gitbug $ ls README
[agallego@agallego-macpro.local] /tmp/gitbug $ git rebase master Current branch imp_fix is up to date.
[agallego@agallego-macpro.local] /tmp/gitbug $ git checkout master Switched to branch 'master'
[agallego@agallego-macpro.local] /tmp/gitbug $ git merge imp_Fix Merge made by the 'recursive' strategy. README | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
[agallego@agallego-macpro.local] /tmp/gitbug $ git push origin master Counting objects: 6, done. Delta compression using up to 4 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (4/4), 392 bytes, done. Total 4 (delta 1), reused 0 (delta 0) remote: bb/acl: agallego is allowed. accepted payload. To git@bitbucket.org:agallego/gitbug 0bfd62a..f99f8a1 master -> master
Sincerely, Alexander Gallego
---*--- ------* * * *
