Re: [PATCH] CodingGuidelines: updating 'rough' rule count

2015-04-12 Thread Eric Sunshine
On Sun, Apr 12, 2015 at 7:47 PM, Julian Gindi juliangi...@gmail.com wrote: Changed inaccurate count of rough rules from three to four. Signed-off-by: Julian Gindi juliangi...@gmail.com --- diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 0f8cccf..c422ecd

Re: Feature request: implement '--follow' option for `git blame`

2015-04-12 Thread Junio C Hamano
Eugen Konkov kes-...@yandex.ru writes: I agree with your complex example. Note that it is a norm, not anything complex, that we do not rename a file wholesale. But it will be great to guess in simple case, when in version v1.0 only one file A which were renamed into C half year later. So

Re: [PATCH v2 2/5] log: honor log.merges= option

2015-04-12 Thread Junio C Hamano
Koosha Khajehmoogahi koo...@posteo.de writes: On 04/08/2015 04:28 AM, Junio C Hamano wrote: It is strange that you have to ask me to give you the reason why you chose it that way, isn't it? AFAIK, the only other command that supports --merges and --no-merges options is rev-list. This new

Re: [PATCH v2] CodingGuidelines: updating 'rough' rule count

2015-04-12 Thread Eric Sunshine
On Mon, Apr 13, 2015 at 1:00 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Apr 13, 2015 at 12:26 AM, Julian Gindi juliangi...@gmail.com wrote: Changed inaccurate count of rough rules from three to the more generic 'a few'. Imperative: s/Changed/Change/ I forgot to mention

Re: [PATCH 0/2] git-p4: Improve client path detection

2015-04-12 Thread Junio C Hamano
Vitor Antunes vitor@gmail.com writes: Luke Diamand l...@diamand.org wrote on Sun, 05 Apr 2015 20:27:11 +0100 On 28/03/15 12:28, Vitor Antunes wrote: I'm adding a test case for a scenario I was confronted with when using branch detection and a client view specification. It is possible

Re: [PATCH v2] CodingGuidelines: updating 'rough' rule count

2015-04-12 Thread Julian Gindi
Changed inaccurate count of rough rules from three to the more generic 'a few'. --- Documentation/CodingGuidelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 0f8cccf..2dd35bd 100644 ---

Re: [PATCH v2] CodingGuidelines: updating 'rough' rule count

2015-04-12 Thread Eric Sunshine
On Mon, Apr 13, 2015 at 12:26 AM, Julian Gindi juliangi...@gmail.com wrote: CodingGuidelines: updating 'rough' rule count Imperative mood is preferred, so update rather than updating: CodingGuidelines: update 'rough' rule count Changed inaccurate count of rough rules from three to the

[PATCH] gitweb: Update logo and favicon

2015-04-12 Thread Thomas Schneider
The new images were downloaded from https://git-scm.herokuapp.com/downloads/logos and converted with ImageMagick: convert -resize 72x30 Git-Logo-2Color.eps git-logo.png convert -resize 16x16 Git-Icon-1788C.eps git-favicon.png The old logo was only 27 pixels in height, the 3 additional pixels

[PATCH] CodingGuidelines: updating 'rough' rule count

2015-04-12 Thread Julian Gindi
Changed inaccurate count of rough rules from three to four. Signed-off-by: Julian Gindi juliangi...@gmail.com --- Documentation/CodingGuidelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index

Re: rebase --root conflicts with --committer-date-is-author-date

2015-04-12 Thread Junio C Hamano
I think that the reason for this behaviour is that rebase --root implicitly forces rebase -i to run (instead of the 'format-patch piped to am'), and --committer-date-is-author-date is not supported by the rebase -i codepath at all. I see Thomas did rebase --root support in v1.6.2 era both in the

[PATCH 3/7] dir.c: replace home_config_paths() with xdg_config_home()

2015-04-12 Thread Paul Tan
Since only the xdg excludes file path is required, simplify the code by replacing use of home_config_paths() with xdg_config_home(). Signed-off-by: Paul Tan pyoka...@gmail.com --- dir.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dir.c b/dir.c index

[PATCH 7/7] path.c: remove home_config_paths()

2015-04-12 Thread Paul Tan
home_config_paths() combines distinct functionality already implemented by expand_user_path() and xdg_config_home(), and it also hard-codes the path ~/.gitconfig, which makes it unsuitable to use for other home config file paths. Since its use will just add unnecessary complexity to the code,

[PATCH 6/7] git-config: replace use of home_config_paths()

2015-04-12 Thread Paul Tan
Since home_config_paths() combines distinct functionality already implemented by expand_user_path() and xdg_config_home(), and hides the home config file path ~/.gitconfig. Make the code more explicit by replacing the use of home_config_paths() with expand_user_path() and xdg_config_home().

[PATCH 4/7] credential-store.c: replace home_config_paths() with xdg_config_home()

2015-04-12 Thread Paul Tan
Since only the xdg credentials file path is required, and home_config_paths() is unable to construct the path ~/.git-credentials, simplify the code by replacing home_config_paths() with xdg_config_home(). Signed-off-by: Paul Tan pyoka...@gmail.com --- credential-store.c | 2 +- 1 file changed, 1

[PATCH 2/7] attr.c: replace home_config_paths() with xdg_config_home()

2015-04-12 Thread Paul Tan
Since only the xdg attributes file path is required, simplify the code by using xdg_config_home() instead of home_config_paths(). Signed-off-by: Paul Tan pyoka...@gmail.com --- attr.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/attr.c b/attr.c index

[PATCH 5/7] git-commit: replace use of home_config_paths()

2015-04-12 Thread Paul Tan
Since home_config_paths() combines two distinct functionality already implemented by expand_user_path() and xdg_config_home(), and hides the home config file path ~/.gitconfig. Make the code more explicit by replacing the use of home_config_paths() with expand_user_path() and xdg_config_home().

[PATCH 1/7] path.c: implement xdg_config_home()

2015-04-12 Thread Paul Tan
The XDG base dir spec[1] specifies that configuration files be stored in a subdirectory in $XDG_CONFIG_HOME. To construct such a configuration file path, home_config_paths() can be used. However, home_config_paths() combines distinct functionality: 1. Retrieve the home git config file path

Re: How to send a warning message from git hosting server?

2015-04-12 Thread Yi, EungJun
On Wed, Apr 8, 2015 at 8:08 PM, Tony Finch d...@dotat.at wrote: Yi, EungJun semtlen...@gmail.com wrote: I want a way to response a remote message when a client send any kind of request. Is it possible? Yes, though you need a wrapper around git. Recent versions of gitolite have a motd

Re: Possible Bug in git-http-push

2015-04-12 Thread bugs
Am 10.04.2015 um 18:55 schrieb Thomas Braun: Am 10.04.2015 um 13:15 schrieb Stefan: Hello List I possibly found a bug in git-http-push: When I push my local repo via http secured with basic authorization, then i get: error: Cannot access URL https://example.ch/example_repo/, return code

Re: [PATCH v2 2/3] p7300: add performance tests for clean

2015-04-12 Thread Thomas Gummerer
On 04/12, erik elfström wrote: On Sat, Apr 11, 2015 at 7:59 PM, Thomas Gummerer t.gumme...@gmail.com wrote: On 04/11, Erik Elfström wrote: Signed-off-by: Erik Elfström erik.elfst...@gmail.com --- t/perf/p7300-clean.sh | 37 + 1 file changed, 37

Re: [PATCH v2 2/3] p7300: add performance tests for clean

2015-04-12 Thread erik elfström
On Sat, Apr 11, 2015 at 7:59 PM, Thomas Gummerer t.gumme...@gmail.com wrote: On 04/11, Erik Elfström wrote: Signed-off-by: Erik Elfström erik.elfst...@gmail.com --- t/perf/p7300-clean.sh | 37 + 1 file changed, 37 insertions(+) create mode 100755

Re: [msysGit] Re: Sneak peek of the upcoming Git for Windows 2.x

2015-04-12 Thread Johannes Schindelin
Hi Rupert, On 2015-04-11 10:37, rupert thurner wrote: three things i do not like it so much: * the old distinct icon is replaced by a new one which looks similar to many other programs, like google chrome. would it be possible to set the old icon? Git 1.9.5 came with the Git icon already

Re: Draft of Git Rev News edition 2

2015-04-12 Thread Thomas Ferris Nicolaisen
On Sun, Apr 12, 2015 at 9:03 PM, Christian Couder christian.cou...@gmail.com wrote: A draft of Git Rev News edition 2 is available here: https://github.com/git/git.github.io/blob/master/rev_news/draft/edition-2.md There's also a secret live preview here now:

Draft of Git Rev News edition 2

2015-04-12 Thread Christian Couder
Hi, A draft of Git Rev News edition 2 is available here: https://github.com/git/git.github.io/blob/master/rev_news/draft/edition-2.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub issue: