search

FredrikNoren / ungit

The easiest way to use git. On any platform. Anywhere.
MIT License
10.45k stars 640 forks source link

After Push nothing happens (fix ui for non-ff push failure) #88

Closed jeroenherczeg closed 11 years ago

jeroenherczeg commented 11 years ago

I try to push a local branch to the github server and I see a Push button loader and then nothing happens. Doesn't ask for credentials. info: POST /api/push

FredrikNoren commented 11 years ago

Hm does it say anything in the ungit console output?

jeroenherczeg commented 11 years ago

info: GET /images/remoteIcon.png info: GET /images/branchIcon.png info: GET /images/tagIcon.png info: GET /api/remote/tags?path=C%3A%5CProgram%20Files%20(x86)%5CAmpps%5Cwww%2FW olf-360-Product-Viewer info: POST /api/push

Could it be because it created the folder when cloning it shows a / after www in the path instead of \ ? C:\Program Files (x86)\Ampps\www/Wolf-360-Product-Viewer

FredrikNoren commented 11 years ago

Hm really weird. No I don't think the slashes will matter for that (I get them jumbled all the time and it works here). What OS, node version and git version are you running?

jeroenherczeg commented 11 years ago

Windows 7 Prof SP1 64bit npm : 1.3.2 git : git version 1.7.9.msysgit.0

jeroenherczeg commented 11 years ago

I am a git noob, I tried it a couple of times in the past but never got around it. That's why I wanted to try ungit, seems a good way to learn git. I looked up how to push from command line and it gave this:

git push -u origin mast ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/jeroenherczeg/Wolf-360-Pr oduct-Viewer.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.

I did git pull and then git push -u origin master and it worked.

Username for 'https://github.com': Password for 'https://jeroenherczeg@github.com': Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 627 bytes, done. Total 6 (delta 2), reused 0 (delta 0) To https://github.com/jeroenherczeg/Wolf-360-Product-Viewer.git 5bf8156..4b563b6 master -> master Branch master set up to track remote branch master from origin.

When I tried using ungit it showed this, push didn't work. But it also didn't ask for my credentials.

snap 2013-08-23 at 23 58 29

Ajedi32 commented 11 years ago

Hmm, so at first glance I'd say that the problem is that ungit can't handle non fast forward pushes? Looking at the graph though it doesn't look like that is a non fast forward push...

FredrikNoren commented 11 years ago

Hm it sounds like you didn't have the latest nodes on your machine and that git couldn't push because master on the server couldn't be automatically fast forwarded with your local changes; i.e. something change on the server which you need to handle locally. I'll try to fix a ui error/warning and perhaps automatically fetch the new nodes so that it's clearer to the user what's going on.

Thanks for the report and the debugging!