This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 232221 - [73cat] Fetch list is not updated correctly
Summary: [73cat] Fetch list is not updated correctly
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.4
Hardware: PC Windows 7
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-03 20:21 UTC by misterm
Modified: 2013-08-16 02:42 UTC (History)
6 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description misterm 2013-07-03 20:21:30 UTC
There are some situations that should affect the fetch list but do not:

1. Create a local branch and push it. It should be added to the fetch list, otherwise Pull from upstream will fail;
2. Deleted a local branch connected to an origin.  It should be removed from the fetch list, otherwise Pull from upstream will fail;
3. Pull... and Fetch... should have a checkbox to modify git/config so only the selected branches are now fetched;

Product Version = NetBeans IDE Dev (Build 20130628-216d1bc31969)
Operating System = Windows 7 version 6.1 running on amd64
Java; VM; Vendor = 1.7.0_07
Runtime = Java HotSpot(TM) 64-Bit Server VM 23.3-b01
Comment 1 Ondrej Vrabec 2013-07-04 05:50:49 UTC
> 1. Create a local branch and push it. It should be added to the fetch list,
> otherwise Pull from upstream will fail;
i agree
> 2. Deleted a local branch connected to an origin.  It should be removed from
> the fetch list, otherwise Pull from upstream will fail;
i don't get it. If the branch is deleted locally that how can it fail? Pull from Upstream fetches the relevant branch to currently checked out local branch, which *cannot* be the deleted one (because it does not exist). Make a screenshot of the error and attach a messages.log whit the error logged.
> 3. Pull... and Fetch... should have a checkbox to modify git/config so only the
> selected branches are now fetched;
I don't get this either. Pull.. and Fetch... allow you to select explicitly what branches to fetch, so what's the point in having another checkbox? Please explain.
Comment 2 misterm 2013-07-04 12:23:54 UTC
(In reply to comment #1)
> > 2. Deleted a local branch connected to an origin.  It should be removed from
> > the fetch list, otherwise Pull from upstream will fail;
> i don't get it. If the branch is deleted locally that how can it fail? Pull
> from Upstream fetches the relevant branch to currently checked out local
> branch, which *cannot* be the deleted one (because it does not exist). Make a
> screenshot of the error and attach a messages.log whit the error logged.

I will.

> > 3. Pull... and Fetch... should have a checkbox to modify git/config so only 
> > the selected branches are now fetched;
> I don't get this either. Pull.. and Fetch... allow you to select explicitly
> what branches to fetch, so what's the point in having another checkbox? Please
> explain.

So that it overrides the configured fetch options and totally replace them by those selected from now, with no need to edit the config file manually.
Comment 3 Ondrej Vrabec 2013-07-04 12:54:41 UTC
> So that it overrides the configured fetch options and totally replace them by
> those selected from now, with no need to edit the config file manually.
I think much more intuitive and transparent is to implement remote init: https://netbeans.org/bugzilla/show_bug.cgi?id=191540 and not add a hundredth checkbox to the fetch/pull panel.
Comment 4 misterm 2013-07-04 13:19:03 UTC
(In reply to comment #3)
> > So that it overrides the configured fetch options and totally replace them by
> > those selected from now, with no need to edit the config file manually.
> I think much more intuitive and transparent is to implement remote init:
> https://netbeans.org/bugzilla/show_bug.cgi?id=191540 and not add a hundredth
> checkbox to the fetch/pull panel.

Will this allow me to remove the current fetch config and not only add a new one?
Comment 5 Quality Engineering 2013-08-01 02:36:55 UTC
Integrated into 'main-silver', will be available in build *201307312300* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/95701c78986f
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #232221 - [73cat] Fetch list is not updated correctly
partial fix: clone action should probably set fetch refspecs in the global form: refs/heads/*:refs/remotes/origin/* to avoid inconsistencies later
Comment 6 Ondrej Vrabec 2013-08-15 11:20:33 UTC
partially fixed in core-main #943e77b28733 - fetch ref specs are automatically updated when doing Fetch/Pull
and with the following fix: autoupdate when pushing

fix: http://hg.netbeans.org/core-main/rev/580e222b9fb6
Comment 7 Quality Engineering 2013-08-16 02:42:00 UTC
Integrated into 'main-silver', will be available in build *201308152300* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/580e222b9fb6
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #232221 - [73cat] Fetch list is not updated correctly
update fetch list also when pushing