Re: [PATCH v2 4/5] t4202-log: add tests for --merges=

2015-04-07 Thread Eric Sunshine
On Sat, Apr 04, 2015 at 03:22:00AM +0200, Koosha Khajehmoogahi wrote: > Helped-by: Eric Sunshine > Signed-off-by: Koosha Khajehmoogahi > --- > diff --git a/t/t4202-log.sh b/t/t4202-log.sh > index 1b2e981..ceaaf4e 100755 > --- a/t/t4202-log.sh > +++ b/t/t4202-log.sh > @@ -270,6 +270,90 @@ cat > ex

[PATCH/RFC] connect.c: Ignore extra colon after hostname

2015-04-07 Thread Torsten Bögershausen
Ignore an extra ':' at the end of the hostname in URL's like "ssh://example.com:/path/to/repo" The colon is ment to separate a port number from the hostname. If the port is empty, the colon should be ignored, see RFC 3986. It had been working for URLs with ssh:// scheme, but was unintentionally b

Bug: global bash variable leak on __gitcompappend

2015-04-07 Thread Marcio Almada
Hi, This is how to reproduce the bug: ``` git checkout [tab-tab] echo $x # outputs the name of the last branch on completion list ``` Or more directly: ``` __gitcompappend "something" echo $x # outputs 'something' ``` No big deal, but it's annoying to know that `$x` is lurking. Cheers, Márcio

Re: EOL conversion on checkout for text files only

2015-04-07 Thread Torsten Bögershausen
On 2015-04-06 20.05, Borek Bernard wrote: > Hi, > > I'd like to propose a new behavior around EOL normalization / forcing > using gitattributes. > > My use case is this: I want to ensure that LF line endings are used in > the repo *and* in all working directories, on all platforms (in our > case,

Re: [PATCH v7 1/4] sha1_file.c: support reading from a loose object of unknown type

2015-04-07 Thread karthik nayak
On 04/06/2015 01:27 AM, Junio C Hamano wrote: karthik nayak writes: > On 04/05/2015 01:16 PM, Junio C Hamano wrote: > >> If it semantically does not make sense to ask for the typename >> without asking for the type code, then we can and should make that >> as a new calling convention _all_ cal

Re: [Feature REQ]Add CURLOPT_SSL_CIPHER_LIST to git for allowing custom cipher usages

2015-04-07 Thread Kevin D
On Mon, Apr 06, 2015 at 09:27:53AM -0300, Steven Huang wrote: > Hi, > > We know git uses cURL to grab https repositories from the Internet. > Nowadays > the SSL-enabled git repos are getting more and more, especially > self-hosted > ones. > > Some of the websites including those

Re: [v6 PATCH] daemon: add systemd support

2015-04-07 Thread Ramsay Jones
On 07/04/15 03:03, Shawn Landden wrote: > systemd supports git-daemon's existing --inetd mode as well. > --systemd allows git-daemon has the advantage of allowing one git-daemon > to listen to multiple interfaces as well as the system one(s), > and more allow git-daemon to not be spawned on every c

Followup: Managing EXCEL with git - diff problem.

2015-04-07 Thread Randall S. Becker
Hi all, There was a discussion a while back on how to manage EXCEL content in git. This involved a simple trick of modifying the file extension from .xlsx to .zip and unpacking the file - resulting in a whole bunch of XML files. Git is happy with that part and the content can be managed - slightly

Setting the http proxy server in git for windows

2015-04-07 Thread Justin Dearing
According to the git documentation on http proxy: http.proxy Override the HTTP proxy, normally configured using the http_proxy, https_proxy, and all_proxyenvironment variables (see curl(1)). This can be overridden on a per-remote basis; see remote..proxy On windows, proxy settings are traditiona

Re: Followup: Managing EXCEL with git - diff problem.

2015-04-07 Thread John Keeping
On Tue, Apr 07, 2015 at 08:55:11AM -0400, Randall S. Becker wrote: > There was a discussion a while back on how to manage EXCEL content in git. > This involved a simple trick of modifying the file extension from .xlsx to > .zip and unpacking the file - resulting in a whole bunch of XML files. Git >

Re: gitk won't show notes?

2015-04-07 Thread Michael J Gruber
Phillip Susi venit, vidit, dixit 02.04.2015 21:34: > I can't seem to get gitk to show notes, even when I give it --notes. > Does it just not handle notes? > > Have you tried with "--show-notes"? It works over here even without --show-notes, by the way, but I'm not on Windows. Are you? Michael

Re: [PATCH 3/6] strbuf_getwholeline: use getc_unlocked

2015-04-07 Thread Rasmus Villemoes
On Sun, Apr 05 2015, Jeff King wrote: > which is back to the v2.0.0 number. Even with the extra strlen, it seems > that what fgets does internally beats repeated getc calls. Which I guess > is not too surprising, as each getc() will have to check for underflow > in the buffer. Perhaps there is mo

Re: rev-list pretty format behavior

2015-04-07 Thread Michael J Gruber
Oliver Runge venit, vidit, dixit 06.04.2015 13:05: > Hallo, Mr. Hamano. > > Thank you for your quick and detailed response. > > On 5 April 2015 at 23:12, Junio C Hamano wrote: >> This is very much the designed behaviour, I would think. IIRC, the >> user-format support of "rev-list" was designed

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-04-07 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 6, 2015 at 10:28 PM, Stefan Beller wrote: > I am interested in discussing the git pack protocol v2. > (I have been thinking about that for a while now, > though not sharing a lot on the mailing list, so feedback is > somewhat limited. :( ) I'm keen to talk about the new protocol and o

Re: gitk won't show notes?

2015-04-07 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 4/7/2015 9:40 AM, Michael J Gruber wrote: > Phillip Susi venit, vidit, dixit 02.04.2015 21:34: >> I can't seem to get gitk to show notes, even when I give it >> --notes. Does it just not handle notes? >> >> > > Have you tried with "--show-notes"?

Re: gitk won't show notes?

2015-04-07 Thread Michael J Gruber
Phillip Susi venit, vidit, dixit 07.04.2015 16:06: > On 4/7/2015 9:40 AM, Michael J Gruber wrote: >> Phillip Susi venit, vidit, dixit 02.04.2015 21:34: >>> I can't seem to get gitk to show notes, even when I give it >>> --notes. Does it just not handle notes? >>> >>> > >> Have you tried with "--sh

Shallow Push?

2015-04-07 Thread Samuel Williams
Is it possible to only push what is required to checkout the latest HEAD? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

git-gui: Updated Bulgarian translation (547t,0f,0u)

2015-04-07 Thread Alexander Shopov
I am sending updated Bulgarian translation of to git-gui According to http://tinyurl.com/gitcal maintainer merge is tomorrow. Hopefully this change will make it. Kind regards: al_shopov -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

[PATCH] gitk: Update Bulgarian translation (304t)

2015-04-07 Thread Alexander Shopov
Signed-off-by: Alexander Shopov --- po/bg.po | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/bg.po b/po/bg.po index 1df0716..ddc8e73 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,15 +1,15 @@ # Bulgarian translation of gitk po-file. -# Copyright (C) 2014 Alex

gitk: Updated Bulgarian translation (304)

2015-04-07 Thread Alexander Shopov
I am sending updated Bulgarian translation of gitk According to http://tinyurl.com/gitcal maintainer merge is tomorrow. Hopefully this change will make it as well. Kind regards: al_shopov -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger

[PATCHv2] gitk: Show the current view's name in the window title.

2015-04-07 Thread Marc Branchaud
If the current view is the "Command line" view, show the command line arguments instead of the view name. Signed-off-by: Marc Branchaud --- This is v2 of my previous "Show the command-line revs in the window title" RFC patch. (I'm having trouble accessing gmane, or I'd include a link here.) Th

[PATCH] gitk: Use translated version of "Command line" in getcommitlines.

2015-04-07 Thread Marc Branchaud
Signed-off-by: Marc Branchaud --- I noticed this today. I think this change is needed for getcommitlines to work properly with translated gitk's. M. gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index 90419e3..fd5b50a 100755 --- a/gitk ++

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-04-07 Thread Stefan Beller
On Tue, Apr 7, 2015 at 6:55 AM, Ævar Arnfjörð Bjarmason wrote: > On Mon, Apr 6, 2015 at 10:28 PM, Stefan Beller wrote: >> I am interested in discussing the git pack protocol v2. >> (I have been thinking about that for a while now, >> though not sharing a lot on the mailing list, so feedback is >>

[v7 PATCH] daemon: add systemd support

2015-04-07 Thread Shawn Landden
git-daemon's --systemd mode allows git-daemon to be connect-activated on one or more addresses or ports. Unlike --inetd[1], git-daemon is not spawned for every connection. [1]which systemd is compatible with using its Accept=yes mode Signed-off-by: Shawn Landden --- Repond to Eric Sunshine's rev

Re: gitk won't show notes?

2015-04-07 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 4/7/2015 10:13 AM, Michael J Gruber wrote: > Seriously: gitk knows F5 and Shift-F5 for refresh, and I think the > latter is the thorougher refreshment. Neither one makes newly added notes show up. The only way seems to be to close and restart git

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

2015-04-07 Thread KES
Пересылаемое сообщение 06.04.2015, 15:12, "KES" : $ pwd /data/mdi2/classes $ git blame -L22,+1 -- utils.js 99b7a802 mdi2/utils.js (user 2015-03-26 21:54:57 +0200 22)  #comment $ git blame -L22,+1 99b7a802^ -- utils.js fatal: no such path mdi2/classes/

git diff bug? what problem may be here

2015-04-07 Thread KES
When after editing I get this:  mdi.Application= this;  mdi.Class.TApplication.baseConstructor.apply( this, arguments ); git diff shows:   mdi.Application= this; - mdi.Class.TApplication.baseConstructor.apply( this, arguments ); - //We must not create/show application node because of this is th

Re: [PATCH/RFC] connect.c: Ignore extra colon after hostname

2015-04-07 Thread Eric Sunshine
On Tue, Apr 7, 2015 at 3:50 AM, Torsten Bögershausen wrote: > Ignore an extra ':' at the end of the hostname in URL's like > "ssh://example.com:/path/to/repo" > > The colon is ment to separate a port number from the hostname. s/ment/meant/ More below. > If the port is empty, the colon should be

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-04-07 Thread Jeff King
On Mon, Apr 06, 2015 at 09:08:54PM +0200, Christian Couder wrote: > By the way as far as I know nothing has been planned for the > Contributors Summit on the 8th. The agenda is open. I had figured we would collectively organize the schedule in the morning (unconference-style). I'd certainly encou

Re: [PATCH 3/6] strbuf_getwholeline: use getc_unlocked

2015-04-07 Thread Jeff King
On Tue, Apr 07, 2015 at 03:48:33PM +0200, Rasmus Villemoes wrote: > > 3. Find some alternative that is more robust than fgets, and faster > > than getc. I don't think there is anything in stdio, but I am not > > above dropping in a faster non-portable call if it is available, > >

Re: [PATCH 1/3] t7300: add tests to document behavior of clean and nested git

2015-04-07 Thread erik elfström
will fix! On Tue, Apr 7, 2015 at 12:06 AM, Eric Sunshine wrote: > On Mon, Apr 6, 2015 at 7:48 AM, Erik Elfström wrote: >> Signed-off-by: Erik Elfström >> --- >> diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh >> index 99be5d9..cfdf6d4 100755 >> --- a/t/t7300-clean.sh >> +++ b/t/t7300-clean.sh

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

2015-04-07 Thread erik elfström
Will fix! Also I forgot to ask, does anyone have a good way of moving the copy out of the performance timing? After the fix this test spends more time copying than cleaning and that is not so good. I'm not very good at shell scripting and the only way I could think of was to make multiple copies

Re: [PATCH 1/3] t7300: add tests to document behavior of clean and nested git

2015-04-07 Thread Eric Sunshine
On Mon, Apr 6, 2015 at 7:48 AM, Erik Elfström wrote: > Signed-off-by: Erik Elfström > --- > diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh > index 99be5d9..cfdf6d4 100755 > --- a/t/t7300-clean.sh > +++ b/t/t7300-clean.sh > @@ -455,6 +455,88 @@ test_expect_success 'nested git work tree' ' > +tes

Re: [PATCH 1/3] t7300: add tests to document behavior of clean and nested git

2015-04-07 Thread Torsten Bögershausen
On 2015-04-07 21.40, Eric Sunshine wrote: > On Mon, Apr 6, 2015 at 7:48 AM, Erik Elfström wrote: >> Signed-off-by: Erik Elfström >> --- >> diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh >> index 99be5d9..cfdf6d4 100755 >> --- a/t/t7300-clean.sh >> +++ b/t/t7300-clean.sh >> @@ -455,6 +455,88 @@

Re: [PATCH 3/3] clean: improve performance when removing lots of directories

2015-04-07 Thread erik elfström
On Tue, Apr 7, 2015 at 12:10 AM, Eric Sunshine wrote: > On Mon, Apr 6, 2015 at 7:48 AM, Erik Elfström wrote: >> Before this change, clean used resolve_gitlink_ref to check for the >> presence of nested git repositories. This had the drawback of creating >> a ref_cache entry for every directory th

[PATCH v2] connect.c: Ignore extra colon after hostname

2015-04-07 Thread Torsten Bögershausen
Ignore an extra ':' at the end of the hostname in URL's like "ssh://example.com:/path/to/repo" The colon is meant to separate a port number from the hostname. If the port is empty, the colon should be ignored, see RFC 3986. It had been working for URLs with ssh:// scheme, but was unintentionally

Re: [PATCH v7 1/4] sha1_file.c: support reading from a loose object of unknown type

2015-04-07 Thread Eric Sunshine
On Sun, Apr 5, 2015 at 2:28 PM, Karthik Nayak wrote: > Update sha1_loose_object_info() to optionally allow it to read > from a loose object file of unknown/bogus type; as the function > usually returns the type of the object it read in the form of enum > for known types, add an optional "typename"

Re: [PATCH v7 2/4] cat-file: teach cat-file a '--literally' option

2015-04-07 Thread Eric Sunshine
On Sat, Apr 4, 2015 at 1:44 AM, Karthik Nayak wrote: > Currently 'git cat-file' throws an error while trying to > print the type or size of a broken/corrupt object which is > created using 'git hash-object --literally'. This is > because these objects are usually of unknown types. This focus of t

Re: [PATCH v7 3/4] cat-file: add documentation for '--literally' option.

2015-04-07 Thread Eric Sunshine
On Sat, Apr 4, 2015 at 1:44 AM, Karthik Nayak wrote: > Signed-off-by: Karthik Nayak > --- > diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt > index f6a16f4..8bac7bd 100644 > --- a/Documentation/git-cat-file.txt > +++ b/Documentation/git-cat-file.txt > @@ -9,7 +9,7 @@

Re: [PATCH v7 4/4] t1006: add tests for git cat-file --literally

2015-04-07 Thread Eric Sunshine
On Sat, Apr 4, 2015 at 1:44 AM, Karthik Nayak wrote: > Signed-off-by: Karthik Nayak > --- > diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh > index ab36b1e..5b74044 100755 > --- a/t/t1006-cat-file.sh > +++ b/t/t1006-cat-file.sh > @@ -47,6 +47,18 @@ $content" > test_cmp expect actua

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

2015-04-07 Thread Koosha Khajehmoogahi
On 04/04/2015 10:00 PM, Junio C Hamano wrote: > Koosha Khajehmoogahi writes: > >> From: Junio C Hamano >> >> [kk: wrote commit message] > > Ehh, what exactly did you write ;-)? > > I think the most important thing that needs to be explained by the > log message for this change is that the va

Re: [PATCH 3/6] strbuf_getwholeline: use getc_unlocked

2015-04-07 Thread Rasmus Villemoes
On Tue, Apr 07 2015, Jeff King wrote: > On Tue, Apr 07, 2015 at 03:48:33PM +0200, Rasmus Villemoes wrote: > >> Implementation-wise, I think strbuf_getwholeline could be implemented >> mostly as a simple wrapper for getdelim. If I'm reading the current code >> and the posix spec for getdelim corre

Re: [PATCH 3/6] strbuf_getwholeline: use getc_unlocked

2015-04-07 Thread Jeff King
On Wed, Apr 08, 2015 at 12:43:09AM +0200, Rasmus Villemoes wrote: > Hm, I'm afraid it's not that simple. It seems that data may be lost from > the stream if getdelim encounters ENOMEM: Looking at the glibc > implementation (libio/iogetdelim.c), if reallocating the user buffer > fails, -1 is return

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

2015-04-07 Thread Junio C Hamano
Koosha Khajehmoogahi writes: > On 04/04/2015 10:00 PM, Junio C Hamano wrote: >> Koosha Khajehmoogahi writes: >> >>> From: Junio C Hamano >>> >>> [kk: wrote commit message] >> >> Ehh, what exactly did you write ;-)? >> >> I think the most important thing that needs to be explained by the >> l

Re: [PATCH 18/25] list-files: delete redundant cached entries

2015-04-07 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Apr 6, 2015 at 9:52 AM, Nguyễn Thái Ngọc Duy > wrote: >> When both --cached and one of -amdAMD is used together we may have two >> entries of the same path, e.g. " foo" and "MM foo". In this case it's >> pretty clear that "foo" must be tracked, no need to displa

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

2015-04-07 Thread Junio C Hamano
KES writes: > **UPDATE:** Short answer > > `git blame` follow renames but not for `git blame COMMIT^ -- ` Suppose you have file A and file B in your version v1.0. Six month down the road, the code was much refactored, and you do not need the contents of these two files separately. You have rem

[PATCH] fix global bash variable leak on __gitcompappend

2015-04-07 Thread Márcio Almada
--- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 661a829..1620546 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-co

[PATCH] fix global bash variable on __gitcompappend

2015-04-07 Thread Márcio Almada
Hi, This is how to reproduce the bug: ``` git checkout [tab-tab] echo $x # outputs the name of the last branch on completion list ``` Or more directly: ``` __gitcompappend "something" echo $x # outputs 'something' ``` Might not be a big deal, but it's annoying to know that `$x` is lurking. Má