After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 699936 - git: Rebase rather than pull
git: Rebase rather than pull
Status: RESOLVED FIXED
Product: jhbuild
Classification: Infrastructure
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: Jhbuild maintainers
Jhbuild QA
Depends on:
Blocks:
 
 
Reported: 2013-05-08 15:25 UTC by Zeeshan Ali
Modified: 2013-05-09 00:26 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
git: Rebase rather than pull (1.79 KB, patch)
2013-05-08 15:25 UTC, Zeeshan Ali 		reviewed Details | Review
git: Rebase rather than pull (1.91 KB, patch)
2013-05-08 21:27 UTC, Zeeshan Ali 		committed Details | Review

Description Zeeshan Ali 2013-05-08 15:25:09 UTC 
See patch.
Comment 1 Zeeshan Ali 2013-05-08 15:25:11 UTC 
Created attachment 243596 [details] [review]
git: Rebase rather than pull

There is no point in pulling changes from remote immediately after a
'remote update'. We should simply do a rebase.
Comment 2 Colin Walters 2013-05-08 21:02:40 UTC 
Review of attachment 243596 [details] [review]:

Huh, I'd never seen "git remote update".  While this isn't a serious problem, with this patch we're now calling get_current_branch() twice; refactor to only call once?
Comment 3 Zeeshan Ali 2013-05-08 21:27:25 UTC 
Created attachment 243626 [details] [review]
git: Rebase rather than pull

There is no point in pulling changes from remote immediately after a
'remote update'. We should simply do a rebase.
Comment 4 Colin Walters 2013-05-09 00:24:02 UTC 
Review of attachment 243626 [details] [review]:

Looks good.
Comment 5 Zeeshan Ali 2013-05-09 00:26:45 UTC 
Attachment 243626 [details] pushed as 2405975 - git: Rebase rather than pull