Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

error when push fails due to changes on remote #10

Open
jacksingleton opened this issue Apr 20, 2016 · 4 comments
Open

error when push fails due to changes on remote #10

jacksingleton opened this issue Apr 20, 2016 · 4 comments

Comments

@jacksingleton
Copy link
Collaborator

When another change has been made on the remote I'm pushing to (requiring a git pull) talisman fails in quite an ugly way:

FATA[0000] Command execution failed                      error=exit status 128 output=
error: failed to push some refs to 'git@github.com:jacksingleton/push-test.git'
@harinee
Copy link
Collaborator

harinee commented Apr 28, 2019

@aaquibzama-tw @vhasus This is still reproducible. Any possible solutions for this?

@harinee
Copy link
Collaborator

harinee commented Oct 1, 2019

@svishwanath-tw are you looking into this issue? If not, could you please un-assign yourself?

@svishwanath-tw svishwanath-tw removed their assignment Oct 1, 2019
@jpninanjohn
Copy link

Can anyone add steps to reproduce this? I would like to try a hand at fixing this.

@harinee
Copy link
Collaborator

harinee commented Oct 5, 2019

@jpninanjohn

Steps to reproduce:

  1. Ensure you do not have Talisman installed.
  2. On an existing git repo, make some changes on the github remote repo directly (or get another collaborator to make some changes)
  3. On your local machine, without taking a pull, try to push. You will see the error as :
    ! [rejected] master -> master (fetch first) error: failed to push some refs to 'git@github.com:user1/somerepo.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  4. Now install Talisman as a pre-push hook
  5. Repeat step 2.
  6. On your local machine, without taking a pull, try to push. Now the error you will see is the uglier one:
    FATA[0000] Git command execution failed command=git diff da142d5ef07cc44c967e791279c05c16c1018..d731f1bfdaad1eadc8a5d069d11e8c9de0db9a --name-only --diff-filter=ACM dir=/some/somrepo error=exit status 128 output=fatal: Invalid revision range da142d5ef07cc44c967e791279c05c16c1018..d731f1bfdaad1eadc8a5d069d11e8c9de0db9a error: failed to push some refs to 'git@github.com:user1/somerepo.git'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

5 participants