git - "unpack failed: error Missing commit" but commit exists -


after long hours of searching specific problem, didn't find solution post question here:

scenario:

  1. two remote servers: git.address-a.com , git.address-b.com
  2. one local repository 2 remotes: origin git.address-a.com , remote-b git.address-b.com
  3. every day, check if pushed remote-b.
  4. if pushed, create new local branch based on master (tracking origin/master), fetch changes remote-b , merge in new branch (branch-b instance).
  5. if ok , there no conflict (i fix them manualy if existe some), checkout master , merge branch-b, push master origin/master.

description of problem:

this workflow had worked well, reason, in last week @ daily integration, git returning me message in push:

error: unpack failed: error missing commit 041460e3edf2f00f75022ce864535ffa2331f1c3 https://myuser@git.address-a.com/git/r/project.git ! [remote rejected] master -> master (n/a (unpacker error)) 

this commit (shorted: 041460) 2 weeks ago , exists in both remotes. but, now, when fetch , merge changes remote-b branch-b, merge master , try push origin error being shown.

commands executed:

#git checkout -b branch-b #git fetch remote-b #git merge remote-b/master #git checkout master #git merge branch-b #git push origin master 

enviroment:

git in remotes: 1.7.1 git in machine: 1.9.1 gitblit 1.6.2 in both remotes

tried:

  • rebase
  • branch in parent of commit informed git , rebase after that.
  • delete local project, redo integration steps again.

have tried

git push --no-thin origin master  

as well?


Comments

Popular posts from this blog

android - MPAndroidChart - How to add Annotations or images to the chart -

javascript - Add class to another page attribute using URL id - Jquery -

firefox - Where is 'webgl.osmesalib' parameter? -