Slow git pulls

Hi All,

First, thanks for the help I have received through this forum. I don't ask many questions, but the answers are always thoughtful / good.

After some thought, I decided to use git for my little projects. I am working on a Wordpress theme and it is very nearly done (just a few more hours!) I am using git / bitbucket for version control. i learned how to use it thoroughly and am happy with git, except for one thing - slow file updates after a pull.
Here is what I mean. I made a few edits on my desktop PC (Windows) on the stylesheet. I committed then pushed the changes to the remote. The next morning, I pulled (not a fetch / merge) the changes to my Mac laptop from the remote and because we are talking about a very small file (16k) it completes in very quickly. Unfortunately, after the pull, the file doesn't change in the working directory for several minutes. If I just walk away for a few minutes, the file will change and its all good. So, why is this taking so long? Everything else is very fast as you would expect...but the wait is just annoying.

Thanks ahead for any replies.

Jim
BTW - pull takes a long time going the other way as well (pulled to the PC) so I don't think it is a matter that the pull is coming to the Mac.....

6 comments

Hello Jim,

How do you pull? Do you call VCS | Update Project or VCS | Git | Pull?
Could you please take a look at the progress at the bottom of the IDE window. It should notify about the stage of the pull process: fetching, rebasing, etc. What exactly takes a lot of time?
Or the process completes quickly, and then you have to wait until the file in the editor updates itself?

0

Hi Kirill,

Thanks for your reply. I am using VCS | Git | Pull. I am pretty much attempting to match what I would do from the command line and doing this maps well. The pull works very quickly - the issue is waiting for the editor to update.
If I do this process differently, using fetch - merge, the issue does not occur and I am now doing this instead. Further, I can always use the command prompt (using git pull ... options or git fetch followed by git merge origin/master ...) and when I do it this way a refresh will update the files immediately. I am fine doing either of these things.

Regards,



Jim
0

Does this slow refresh concern only the file which is open in the editor?
Could you please check other files, for example do the following:
* make some changes in another repository, in a file which is not open in the editor,
* push,
* pull in this repository
* open this file in the editor and check the contents.

0

Hi Kirill,

Sorry to take a bit of time to get back to you. I did as you asked and you are really on to something. If the files were not already open, the new "pulled" versions were there and ready to go. If the file was already open, it had trouble, although it was inconsistent. A couple of times you could see the changes immediately as it updated the screen. Other files seemed to take awhile. I did some experimenting and found one thing. If you had no open files the pull worked flawlessly. It did a great job even when there were conflicts.
Based on what I found, I will probably continue to use fetch / merge because I seem to always have several files open :).

On a similar topic, I noticed what "Update Project" does. I never tried it before and seems to be pretty flexible. When I have time I will experiment a bit with this with the various settings and see if I can improve my workflow.

Thanks for your help.

Regards,

Jim

0

Jim,

could you please clarify the following:
* How do you pull, do you invoke VCS | Git | Pull ? (and this is the case when editors are not refreshed sometimes)
* How do you Fetch (VCS | Git | Fetch?) + Merge (VCS | Git | Merge Changes or VCS | Git | Branches | <select branch> | Merge)? (and it is the case when editors are refreshed without problems, right?)

0

HI Kirill,

Specifically VCS | GIT | PULL using recursive strategy. This is where I had problems with refreshes.
Using fecth is VCS | GIT | FETCH -> VCS | GIT | MERGE CHANGES, then select branch | strategy in dialog. As you say, when using that method the editor refreshes quickly.

Jim

0

Please sign in to leave a comment.