问题
I need to work with an intricate configuration of repositories. I have 5 of them:
- A remote central repository on machine 1.
- My local repository on my notebook (machine 2).
- A bare repository on machine 3.
- A repository on machine 3.
- A repository on machine 4 where we do code review.
So, my understanding that it works this way:
- On my laptop (machine 2) I clone / pull from the central repository located on machine 1.
- I push the local repo to the machine 3 (using the bare repository as a "intermediate").
Now I did some changes on the machine 3 and I want to push these changes to machine 4. Here are the instructions that I need to follow:
- On machine 3 do all work in your test-branch, commit.
- Push to your bare repo on machine 3: git push origin test-branch
- On your laptop: fetch new commits from the machine-3 repo: git fetch machine3
- Check out your branch from machine 3: git checkout -b test-branch machine-3/test-branch
- Fetch commits from machine-4: git fetch origin
- git rebase origin/master
- git push origin HEAD:refs/for/master
I have problems with step 4. I get the following error:
fatal: 'machine3/test-branch' is not a commit and a branch 'test-branch' cannot be created from it
ADDED
When I execute
git rev-parse machine3/test-branch
On my laptop (machine 2) I get:
machine3/test-branch
fatal: ambiguous argument 'machine3/test-branch': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
回答1:
For those who found this searching for an answer to fatal: 'origin/branch' is not a commit and a branch 'branch' cannot be created from it
, you may also want to try git fetch
first.
If you run git checkout -b local-branch-name origin/different-branch-name
without fetch
ing first, you'll run into that error.
Also, if you have multiple remotes (e.g. origin
, then buildserver
, joespc
, etc.), you must specify the remote from which you're attempting to branch in your git fetch
command, as it defaults to your first remote, usually origin
(i.e. git fetch origin
). So, for example, git fetch buildserver
will fetch all the branches from the buildserver
remote.
回答2:
The question is complex / convolute, the answer is simple. There was a mismatch between the alias and machine3. The alias for the remote that has been used, was not for machine3. The machine3 had another alias.
回答3:
If you're checking out a branch from a tag (like git checkout -b XXXX v0.1.1
) , you can try git fetch --tags
first.
来源:https://stackoverflow.com/questions/49297153/why-is-it-not-a-commit-and-a-branch-cannot-be-created-from-it