[PATCH 1/2] t0025: Rename the test files

2014-06-29 Thread Torsten Bögershausen
The current test files are named one, two and three. Make it clearer what the tests do and rename them into LFonly, CRLFonly and LFwithNUL. After the renaming we can see easier that we may want more test cases for 2 types of files: - files which have mixed LF and CRLF line endings, - files which

Re: [PATCH v3 1/4] replace: add --graft option

2014-06-29 Thread Christian Couder
On Sun, Jun 8, 2014 at 10:18 AM, Junio C Hamano gits...@pobox.com wrote: On Sat, Jun 7, 2014 at 11:49 PM, Christian Couder christian.cou...@gmail.com wrote: On Fri, Jun 6, 2014 at 5:44 PM, Christian Couder christian.cou...@gmail.com wrote: /* find existing parents */

[PATCH 2/2] t0027: combinations of core.autocrlf, core.eol and text

2014-06-29 Thread Torsten Bögershausen
Historically there are 3 different parameters controlling how line endings are handled by Git: - core.autocrlf - core.eol - the text attribute in .gitattributes There are different types of content: - (1) Files with only LF - (2) Files with only CRLF - (3) Files with mixed LF and CRLF - (4) Files

trace.c: struct timeval tv not portable

2014-06-29 Thread Torsten Bögershausen
The following printout gives a warning: (trace.c, arounf line 105) strbuf_addf(buf, %02d:%02d:%02d.%06ld , tm.tm_hour, tm.tm_min, tm.tm_sec, tv.tv_usec); trace.c:105: warning: format ‘%06ld’ expects type ‘long int’, but argument 6 has type ‘__darwin_suseconds_t’ A

Re: [PATCH 4/8] add functions for memory-efficient bitmaps

2014-06-29 Thread Eric Sunshine
On Wed, Jun 25, 2014 at 7:40 PM, Jeff King p...@peff.net wrote: We already have a nice-to-use bitmap implementation in ewah/bitmap.c. It pretends to be infinitely long when asking for a bit (and just returns 0 for bits that haven't been allocated or set), and dynamically resizes as appropriate

Re: [PATCH v12 11/11] Documentation: add documentation for 'git interpret-trailers'

2014-06-29 Thread Christian Couder
From: Junio C Hamano gits...@pobox.com Christian Couder chrisc...@tuxfamily.org writes: +The trailers are recognized in the input message using the following +rules: + +* only lines that contains a ':' (colon) are considered trailers, + +* the trailer lines must all be next to each

Re: [RFC/PATCH] notes-util.c: replace git_config with git_config_get_string

2014-06-29 Thread Eric Sunshine
On Thu, Jun 26, 2014 at 4:19 AM, Tanay Abhra tanay...@gmail.com wrote: On 6/25/2014 1:24 PM, Eric Sunshine wrote: On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote: Use git_config_get_string instead of git_config to take advantage of the config hash-table api which provides

Re: [RFC/PATCH V2] branch.c: replace git_config with git_config_get_string

2014-06-29 Thread Eric Sunshine
On Thu, Jun 26, 2014 at 4:09 AM, Tanay Abhra tanay...@gmail.com wrote: On 6/25/2014 10:15 AM, Eric Sunshine wrote: On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote: diff --git a/branch.c b/branch.c index 660097b..c9a2a0d 100644 --- a/branch.c +++ b/branch.c @@ -140,33

Re: [RFC/PATCH] pager.c: replace git_config with git_config_get_string

2014-06-29 Thread Matthieu Moy
Karsten Blees karsten.bl...@gmail.com writes: Am 28.06.2014 08:01, schrieb Matthieu Moy: Karsten Blees karsten.bl...@gmail.com writes: I still don't like that the invalidation is done in git_config_set, though, as this is also used to write completely unrelated files. I don't get it.

Re: What's cooking in git.git (Jun 2014, #06; Thu, 26)

2014-06-29 Thread Johannes Sixt
Am 27.06.2014 00:02, schrieb Junio C Hamano: Four mingw series are still in limbo--are they in good enough shape for Windows folks who wanted to upstream them? I've now tested the Unicode patches a bit, and I didn't notice a regression in my use-cases. The patches are good to go, IMHO. --

Re: Passing rev-list options in git-filter-branch broken

2014-06-29 Thread Felix Eckhofer
Junio, thanks for your reply and your patch. Am 27.06.2014 20:31, schrieb Junio C Hamano: [...] would be a better workaround that would not break repositories with large number of references, but it obviously will lose --date-order option (why would it be even necessary, though? I suspect

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

2014-06-29 Thread Phil Hord
On Fri, Jun 27, 2014 at 6:39 PM, Jason Pyeron jpye...@pdinc.us wrote: On Fri, Jun 27, 2014 at 4:47 PM, Jason Pyeron jpye...@pdinc.us wrote: There are two identical files from the same original parent, but both were renamed in their own branches. One branch moved the file to a new folder,

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

2014-06-29 Thread Phil Hord
On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to 1ca13ed2271d60ba93d40bcc8db17ced8545f172, and manually reconciles the merge), but it was too long to be readable in the email. git blame HEAD --

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

2014-06-29 Thread Phil Hord
On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to 1ca13ed2271d60ba93d40bcc8db17ced8545f172, and manually reconciles the merge), but it was

RE: Trouble merging renamed but identical files - CONFLICT (rename/rename)

2014-06-29 Thread Jason Pyeron
-Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:09 On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

2014-06-29 Thread Phil Hord
On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:09 On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote:

[PATCH 1/2] wt-status: use argv_array for environment

2014-06-29 Thread René Scharfe
Instead of using a PATH_MAX buffer, use argv_array for constructing the environment for git submodule summary. This simplifies the code a bit and removes the arbitrary length limit. Signed-off-by: Rene Scharfe l@web.de --- wt-status.c | 9 - 1 file changed, 4 insertions(+), 5

[PATCH 2/2] wt-status: simplify building of summary limit argument

2014-06-29 Thread René Scharfe
Use argv_array_pushf for building the number string for the option --summary-limit directly instead of using an intermediate buffer. Signed-off-by: Rene Scharfe l@web.de --- wt-status.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wt-status.c b/wt-status.c index

RE: Trouble merging renamed but identical files - CONFLICT (rename/rename)

2014-06-29 Thread Jason Pyeron
-Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:27 On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:09 On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

2014-06-29 Thread Phil Hord
On Sun, Jun 29, 2014 at 5:13 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:27 On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29,