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 217694 - Way to define user and email for automatic merges
Summary: Way to define user and email for automatic merges
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.3
Hardware: PC Windows 7
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-08-31 19:20 UTC by misterm
Modified: 2013-04-23 18:37 UTC (History)
5 users (show)

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description misterm 2012-08-31 19:20:34 UTC 
The IDE should provide an UI for informing which user and email to use for automatic merges from pulling.

Product Version = NetBeans IDE Dev (Build 20120831-087e644a9afa)
Operating System = Windows 7 version 6.1 running on amd64
Java; VM; Vendor = 1.7.0_01
Runtime = Java HotSpot(TM) 64-Bit Server VM 21.1-b02
Comment 1 Ondrej Vrabec 2012-09-01 07:00:56 UTC 
Why? Is a merge committed with a different username and email than specified in .git/config? Then it's a bug.
Or do you really want to merge as a different user? Please describe a meaningful scenario.
Comment 2 misterm 2012-09-01 10:08:48 UTC 
Users do not necessarily have git itself installed on their machines - I'd assume most do not. Right now, if that is the case, there is no way of changing the user/email combination used for a repository or globally.

The IDE allows one to provide such information at commit time, but does not change git config automatically in case it does not contain a default set. That would be another option.
Comment 3 Ondrej Vrabec 2012-09-02 10:58:53 UTC 
> Users do not necessarily have git itself installed on their machines - I'd
> assume most do not. Right now, if that is the case, there is no way of changing
> the user/email combination used for a repository or globally.
Sure there is, File -> Open File... (open REPOSITORY_ROOT/.git/config), edit the file and save. Although i agree it's not very comfortable especially for not experienced git users.
Comment 4 misterm 2013-01-23 17:39:30 UTC 
I was thinking about this issue again today and I think such information should be  collected during the checkout process. If there is an existing checkout without such properties, it is probably because it was done without NetBeans anyway, so they either know git command line or have another tool that they used and that is supposed to support setting this information.

This would make the change easier to implement, right?
Comment 5 misterm 2013-04-23 18:37:18 UTC 
Now that NetBeans always suggests the user configured for that repository, this has become even more important to have.