Re: [GSoC] Proposal: turn git-add--interactive.perl into a builtin

Hi Stefan & Johannes, Thank you for the precious feedback on the proposal. I don't see much sense in sending a full "v2" of it and have you read it all over again, so I'll just answer to your comments directly. Also, although the GSoC website allows me to send a "proposal draft" to you through

Re: [PATCH] http.postbuffer: make a size_t

On 30/03/17 22:29, David Turner wrote: Unfortunately, in order to push some large repos, the http postbuffer must sometimes exceed two gigabytes. On a 64-bit system, this is OK: we just malloc a larger buffer. Signed-off-by: David Turner --- cache.h | 1 + config.c

Dear, I need your help to invest in your country,

I came across your contact during my private search Mrs Aisha Al-Qaddafi is my name, the only daughter of late Libyan president, I have funds the sum of $27.5 million USD for investment, I am interested in you for investment project assistance in your country, i shall compensate you 30% of

[PATCH v3 02/20] Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ

Since we will likely be introducing a new hash function at some point, and that hash function might be longer than 40 hex characters, use the constant GIT_MAX_HEXSZ, which is designed to be suitable for allocations, instead of GIT_SHA1_HEXSZ. This will ease the transition down the line by

[PATCH v3 10/20] sha1_name: convert struct disambiguate_state to object_id

Convert struct disambiguate_state to use struct object_id by changing the structure definition and applying the following semantic patch: @@ struct disambiguate_state E1; @@ - E1.bin_pfx + E1.bin_pfx.hash @@ struct disambiguate_state *E1; @@ - E1->bin_pfx + E1->bin_pfx.hash @@ struct

[PATCH v3 03/20] Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ

Since we will likely be introducing a new hash function at some point, and that hash function might be longer than 20 bytes, use the constant GIT_MAX_RAWSZ, which is designed to be suitable for allocations, instead of GIT_SHA1_RAWSZ. This will ease the transition down the line by distinguishing

[PATCH v3 01/20] Define new hash-size constants for allocating memory

Since we will want to transition to a new hash at some point in the future, and that hash may be larger in size than 160 bits, introduce two constants that can be used for allocating a sufficient amount of memory. They can be increased to reflect the largest supported hash size. Signed-off-by:

[PATCH v3 06/20] builtin/receive-pack: convert portions to struct object_id

Convert some hardcoded constants into uses of parse_oid_hex. Additionally, convert all uses of struct command, and miscellaneous other functions necessary for that. This work is necessary to be able to convert sha1_array_append later on. To avoid needing to specify a constant, reject shallow

[PATCH v3 08/20] parse-options-cb: convert sha1_array_append caller to struct object_id

Signed-off-by: brian m. carlson --- parse-options-cb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parse-options-cb.c b/parse-options-cb.c index b7d8f7dcb2..40ece4d8c2 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -96,7

[PATCH v3 05/20] builtin/pull: convert portions to struct object_id

Convert the caller of sha1_array_append to struct object_id. Signed-off-by: brian m. carlson --- builtin/pull.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 3ecb881b0b..a9f7553f30 100644 ---

[PATCH v3 17/20] Convert sha1_array_lookup to take struct object_id

Convert this function by changing the declaration and definition and applying the following semantic patch to update the callers: @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2.hash) + sha1_array_lookup(E1, ) @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2->hash) + sha1_array_lookup(E1,

[PATCH v3 07/20] fsck: convert init_skiplist to struct object_id

Convert a hardcoded constant buffer size to a use of GIT_MAX_HEXSZ, and use parse_oid_hex to reduce the dependency on the size of the hash. This function is a caller of sha1_array_append, which will be converted later. Signed-off-by: brian m. carlson --- fsck.c |

[PATCH v3 11/20] sha1_name: convert disambiguate_hint_fn to take object_id

Convert this function pointer type and the functions that implement it to take a struct object_id. Introduce a temporary in show_ambiguous_object to avoid having to convert for_each_abbrev at this point. Signed-off-by: brian m. carlson --- sha1_name.c | 64

[PATCH v3 14/20] sha1-array: convert internal storage for struct sha1_array to object_id

Make the internal storage for struct sha1_array use an array of struct object_id internally. Update the users of this struct which inspect its internals. Signed-off-by: brian m. carlson --- bisect.c | 14 +++--- builtin/pull.c | 22

[PATCH v3 18/20] Convert sha1_array_for_each_unique and for_each_abbrev to object_id

Make sha1_array_for_each_unique take a callback using struct object_id. Since one of these callbacks is an argument to for_each_abbrev, convert those as well. Rename various functions, replacing "sha1" with "oid". Signed-off-by: brian m. carlson ---

[PATCH v3 19/20] Rename sha1_array to oid_array

Since this structure handles an array of object IDs, rename it to struct oid_array. Also rename the accessor functions and the initialization constant. This commit was produced mechanically by providing non-Documentation files to the following Perl one-liners: perl -pi -E 's/struct

[PATCH v3 20/20] Documentation: update and rename api-sha1-array.txt

Since the structure and functions have changed names, update the code examples and the documentation. Rename the file to match the new name of the API. Signed-off-by: brian m. carlson --- .../{api-sha1-array.txt => api-oid-array.txt} | 44

[PATCH v3 12/20] submodule: convert check_for_new_submodule_commits to object_id

All of the callers of this function have been converted, so convert this function and update the callers. This function also calls sha1_array_append, which we'll convert shortly. Signed-off-by: brian m. carlson --- builtin/fetch.c | 6 +++--- submodule.c | 4

[PATCH v3 16/20] Convert remaining callers of sha1_array_lookup to object_id

There are a very small number of callers which don't already use struct object_id. Convert them. Signed-off-by: brian m. carlson --- bisect.c | 14 +++--- builtin/pack-objects.c | 16 ref-filter.c | 22

[PATCH v3 00/20] object_id part 7

This is part 7 in the continuing transition to use struct object_id. This series focuses on two main areas: adding two constants for the maximum hash size we'll be using (which will be suitable for allocating memory) and converting struct sha1_array to struct oid_array. The rationale for adding

[PATCH v3 09/20] test-sha1-array: convert most code to struct object_id

This helper is very small, so convert the entire thing. Signed-off-by: brian m. carlson --- t/helper/test-sha1-array.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/helper/test-sha1-array.c b/t/helper/test-sha1-array.c index

[PATCH v3 04/20] builtin/diff: convert to struct object_id

Signed-off-by: brian m. carlson --- builtin/diff.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/builtin/diff.c b/builtin/diff.c index 3d64b85337..398eee00d5 100644 --- a/builtin/diff.c +++ b/builtin/diff.c

[PATCH v3 13/20] builtin/pull: convert to struct object_id

Convert virtually all uses of unsigned char [20] to struct object_id. Leave all the arguments that come from struct sha1_array, as these will be converted in a later patch. Signed-off-by: brian m. carlson --- builtin/pull.c | 72

[PATCH v3 15/20] Make sha1_array_append take a struct object_id *

Convert the callers to pass struct object_id by changing the function declaration and definition and applying the following semantic patch: @@ expression E1, E2; @@ - sha1_array_append(E1, E2.hash) + sha1_array_append(E1, ) @@ expression E1, E2; @@ - sha1_array_append(E1, E2->hash) +

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

Got it. Thanks! On Thu, Mar 30, 2017 at 4:32 PM, Jeff King wrote: > On Thu, Mar 30, 2017 at 04:00:41PM -0700, Nate Mueller wrote: > >> Really? My config has been set this way for years and it's never >> caused problems before. I have subcommands in both of those >> directories

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

On Thu, Mar 30, 2017 at 04:00:41PM -0700, Nate Mueller wrote: > Really? My config has been set this way for years and it's never > caused problems before. I have subcommands in both of those > directories and all work. Really. It did happen to work most of the time before (because most uses

RE:

I have a Charitable Donation proposal for you. Reply to this email for more information Check the link below for confirmation: http://www.ibtimes.co.uk/russias-second-wealthiest-man-mikhail-fridman-plans-leaving-14-2bn-fortune-charity-1561604 Best Regards Mikhail Fridman.

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

Really? My config has been set this way for years and it's never caused problems before. I have subcommands in both of those directories and all work. On Thu, Mar 30, 2017 at 3:57 PM, Junio C Hamano wrote: > Nate Mueller writes: > >> This fails for me

Re: Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

Nate Mueller writes: > This fails for me because my GIT_EXEC_PATH is set to > "/Library/Developer/CommandLineTools/usr/libexec/git-core:/Users/nate/.git-exec". That environment variable is designed to hold a single path, not like $PATH that lists multiple places in a colon

Re: /bin/bash: /usr/ucb/install: No such file or directory

Jeffrey Walton writes: > I think this is the last of the issues for Git 2.12.2 on Solaris 11.3. > > It looks like 'install' is located in a few places, but not in > '/usr/ucb'. I believe /usr/ucb is Solaris 9 or Solaris 10. I think the > equivalent place to look on Solaris 11

RE:

I have a Charitable Donation proposal for you. Reply to this email for more information Check the link below for confirmation: http://www.ibtimes.co.uk/russias-second-wealthiest-man-mikhail-fridman-plans-leaving-14-2bn-fortune-charity-1561604 Best Regards Mikhail Fridman.

Issue with 2.11.0 and GIT_EXEC_PATH with multiple entries

I ran into this after upgrading to 2.11.0 through Xcode. I assumed it was a packaging issue but it looks like it's been in the mainline since 1073094f30 (on October 29). In 2.11.0, git-sh-setup switched it's call of git-sh-i18n from: . git-sh-i18n to: . "$(git --exec-path)/git-sh-i18n" This

/bin/bash: /usr/ucb/install: No such file or directory

I think this is the last of the issues for Git 2.12.2 on Solaris 11.3. It looks like 'install' is located in a few places, but not in '/usr/ucb'. I believe /usr/ucb is Solaris 9 or Solaris 10. I think the equivalent place to look on Solaris 11 is /usr/gnu (but I only have limited experience on

[PATCH v2] http.postbuffer: allow full range of ssize_t values

Unfortunately, in order to push some large repos, the http postbuffer must sometimes exceed two gigabytes. On a 64-bit system, this is OK: we just malloc a larger buffer. Signed-off-by: David Turner --- cache.h | 1 + config.c | 17 + http.c | 4 ++--

Re: [PATCH] http.postbuffer: make a size_t

David Turner writes: > Unfortunately, in order to push some large repos, the http postbuffer > must sometimes exceed two gigabytes. On a 64-bit system, this is OK: > we just malloc a larger buffer. > > Signed-off-by: David Turner > --- > cache.h |

Re: Git and PCRE2 vs PCRE?

On Thu, Mar 30, 2017 at 5:23 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> Is it possible to use PCRE2 with Git? If so, how do I tell Git to use PCRE2? > > Given that pcre2's symbols are all prefixed with pcre2_ (I only > checked

Re: [PATCH v2] log: if --decorate is not given, default to --decorate=auto

Jeff King writes: > On Thu, Mar 30, 2017 at 11:03:51AM -0700, Junio C Hamano wrote: > >> With the "--decorate=auto" option becoming the default for "git >> log", "git tbdiff" will be broken. >> ... > I'm confused. I thought "auto" would kick in only when we are outputting > to a

Re: [PATCH v2] log: if --decorate is not given, default to --decorate=auto

On Thu, Mar 30, 2017 at 11:03:51AM -0700, Junio C Hamano wrote: > With the "--decorate=auto" option becoming the default for "git > log", "git tbdiff" will be broken. > > The configuration variable has been already there, so in that sense > this is not a new breakage (tbdiff wouldn't have worked

Re: ttk error when starting git gui

On 03/30/2017 01:54 PM, Peter van der Does wrote: On 3/30/17 1:01 PM, David Shrader wrote: Hello, I get the following error when trying to start git gui: Error in startup script: wrong # args: should be "ttk::style theme use theme" while executing "ttk::style theme use" (procedure

[RFC/PATCH] Make “git tag --contains ” less chatty if is invalid (gsoc)

Hi Git devs, I am a student interested for Gsoc. With my patch I am able to produce following output.     $ git tag --contains qq     error: malformed object name qq     $ git tag --contains HEAD qq     fatal: --contains option is only allowed with -l.     $ git tag --contains

Re: Git and PCRE2 vs PCRE?

Jeffrey Walton writes: > Is it possible to use PCRE2 with Git? If so, how do I tell Git to use PCRE2? Given that pcre2's symbols are all prefixed with pcre2_ (I only checked http://www.pcre.org/current/doc/html/pcre2api.html) and we do not see any hits from "git grep pcre2",

Re: Git and PCRE2 vs PCRE?

On Thu, Mar 30, 2017 at 04:59:27PM -0400, Jeffrey Walton wrote: > Configure has an option for libpcre, but its not clear to me how to > fine tune it for libpcre2: > > $ ./configure --help | /usr/gnu/bin/grep -A 2 -i pcre > --with-libpcre support Perl-compatible regexes (default is NO)

[PATCH v2] read-cache: avoid using git_path() in freshen_shared_index()

When performing an interactive rebase in split-index mode, the commit message that one should rework when squashing commits can contain some garbage instead of the usual concatenation of both of the commit messages. Bisecting shows that c3a0082502 (read-cache: use freshen_shared_index() in

Git and PCRE2 vs PCRE?

Some more 2.12.2 testing on Solaris 11.3 x86_64: ... CC ident.o CC kwset.o CC line-log.o CC levenshtein.o CC line-range.o CC list-objects.o In file included from revision.h:5:0, from line-log.c:10: grep.h:5:18: fatal error: pcre.h: No such file or

RE: [PATCH] http.postbuffer: make a size_t

GitLab. I can't speak to our particular configuration of it -- but if you have a specific question about what the config is, I can ask our gitlab admins. > -Original Message- > From: Shawn Pearce [mailto:spea...@spearce.org] > Sent: Thursday, March 30, 2017 4:42 PM > To: David Turner

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

On Thu, Mar 30, 2017 at 4:30 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: >>> Jeffrey Walton writes: >>> Some more 2.12.2 testing on Solaris 11.3

Re: ttk error when starting git gui

On Thu, 2017-03-30 at 15:54 -0400, Peter van der Does wrote: > It looks like the git gui needs TCL/TK 8.6.0 or higher. Since that > version the command 'ttk::style theme use' has been changed, which > allows the command to be run without an argument and then returning the > current theme used. >

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

Jeff King writes: > Still, I'm not sure the extra layer of cache is all that valuable. It > should be a single hash lookup in the config cache (in an operation that > otherwise reads the entire index). OK, let's drop that part, then.

Re: [PATCH] http.postbuffer: make a size_t

On Thu, Mar 30, 2017 at 1:29 PM, David Turner wrote: > Unfortunately, in order to push some large repos, the http postbuffer > must sometimes exceed two gigabytes. On a 64-bit system, this is OK: > we just malloc a larger buffer. I'm slightly curious what server you are

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

On Thu, Mar 30, 2017 at 09:06:48PM +0100, Thomas Gummerer wrote: > > Yeah, I think that would be fine. You _could_ write a t/perf test and > > then use your 400MB monstrosity as GIT_PERF_LARGE_REPO. But given that > > most people don't have such a thing, there's not much value over you > > just

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

Jeffrey Walton writes: > On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: >> Jeffrey Walton writes: >> >>> Some more 2.12.2 testing on Solaris 11.3 x86_64: >>> >>> $ make V=1 >>> gcc -o credential-store.o -c -MF

[PATCH] http.postbuffer: make a size_t

Unfortunately, in order to push some large repos, the http postbuffer must sometimes exceed two gigabytes. On a 64-bit system, this is OK: we just malloc a larger buffer. Signed-off-by: David Turner --- cache.h | 1 + config.c | 17 + http.c | 2 +- 3

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

On Thu, Mar 30, 2017 at 4:06 PM, Jeffrey Walton wrote: > On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: >> Jeffrey Walton writes: >> >>> Some more 2.12.2 testing on Solaris 11.3 x86_64: >>> >>> $ make V=1 >>> gcc -o

Re: [PATCH] Docs: Add some missing options to git-diff.txt

Andreas Heiduk writes: > git-diff understands "--ours", "--theirs" and "--base" for files with > conflicts. But so far they were not documented for the central diff > command but only for diff-files. This is probably a shared issue with the original text for "diff-files",

Re: ttk error when starting git gui

On 3/30/17 1:01 PM, David Shrader wrote: > Hello, > > I get the following error when trying to start git gui: > > Error in startup script: wrong # args: should be "ttk::style theme use > theme" > while executing > "ttk::style theme use" > (procedure "ttext" line 4) > invoked from

Re: [PATCH v4 0/8] refactor the filter process code into a reusable module

Now 1 & 2 are as equally pleasant to read as others ;-). Let's wait for a few days and then merge to 'next'. I didn't see anything questionable. Thanks.

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

On 03/28, Jeff King wrote: > On Tue, Mar 28, 2017 at 03:50:34PM -0400, Jeff Hostetler wrote: > > > It was a convenient way to isolate, average, and compare > > read_index() times, but I suppose we could do something > > like that. > > > > I did confirm that a ls-files does show a slight 0.008 >

Re: git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

On Wed, Mar 29, 2017 at 1:11 PM, Junio C Hamano wrote: > Jeffrey Walton writes: > >> Some more 2.12.2 testing on Solaris 11.3 x86_64: >> >> $ make V=1 >> gcc -o credential-store.o -c -MF ./.depend/credential-store.o.d -MQ >> credential-store.o -MMD -MP

Re: [BUG?] iconv used as textconv, and spurious ^M on added lines on Windows

On Thu, Mar 30, 2017 at 09:35:27PM +0200, Jakub Narębski wrote: > And everything would be all right... if not the fact that Git appends > spurious ^M to added lines in the `git diff` output. Files use CRLF > end-of-line convention (the native MS Windows one). > > $ git diff test.tex > diff

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

On Thu, Mar 30, 2017 at 12:49:15PM -0700, Junio C Hamano wrote: > Notable suggested changes I have in this one are: > > * I stole the numbers from the cover letter of v2 and added them at >the end of the log message. Yeah, good. > * As the checksum is not a useless relic, but is an

[PATCH] Docs: Add some missing options to git-diff.txt

git-diff understands "--ours", "--theirs" and "--base" for files with conflicts. But so far they were not documented for the central diff command but only for diff-files. Signed-off-by: Andreas Heiduk --- Documentation/git-diff.txt | 8 1 file changed, 8

Re: [ANNOUNCE] Git for Windows 2.12.2

Forwarding to the lists, as my original message was rejected for html. On Thu, Mar 30, 2017 at 3:44 PM, Andrew Witte wrote: > Just updated back to git 2.12.2 and git-lfs 2.0.2 and everything worked > fine. Wish I could have gotten more info when it happened as its happened

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

Jeff King writes: > So just mentioning the test case and the improvement in the commit > message is sufficient, IMHO. So here is how I butchered [v3 1/2] to tentatively queue it on 'pu'. Notable suggested changes I have in this one are: * I stole the numbers from the cover

[BUG?] iconv used as textconv, and spurious ^M on added lines on Windows

Hello, Recently I had to work on a project which uses legacy 8-bit encoding (namely cp1250 encoding) instead of utf-8 for text files (LaTeX documents). My terminal, that is Git Bash from Git for Windows is set up for utf-8. I wanted for "git diff" and friends to return something sane on said

Re: [RFC] should these two topics graduate to 'master' soon?

Jeff King writes: > On Tue, Mar 28, 2017 at 11:51:49AM -0700, Jonathan Nieder wrote: > >> > * jc/merge-drop-old-syntax (2015-04-29) 1 commit >> > >> > This topic stops "git merge HEAD " syntax that >> > has been deprecated since October 2007 (and we have issued a >> >

I need your urgent help...

Hello, I have a personal Project in which i need your assistance I would like to be sure of your willingness and commitment to execute this transaction with me. I seek your partnership in receiving this fund worth (Twenty five million United States Dollars). If interested, reply immediately for

Re: [PATCH 3/3] WIP - Allow custom printf function for column printing

On Wed, Mar 29, 2017 at 8:22 PM, Jeff King wrote: > On Wed, Mar 29, 2017 at 06:42:38PM -0700, Stefan Beller wrote: > >> Ever wondered why column.ui applies the untracked files in git-status, >> but not for the help text comment in git-commit? Nobody wrote the code! >> >> This is

Re: [PATCH 2/2] config: resolve symlinks in conditional include's patterns

Nguyễn Thái Ngọc Duy writes: > $GIT_DIR returned by get_git_dir() is normalized, with all symlinks > resolved (see setup_work_tree function). In order to match paths (or > patterns) against $GIT_DIR char-by-char, they have to be normalized > too. There is a note in config.txt

Re: [PATCH 2/2] submodule.c: correctly handle nested submodules in is_submodule_modified

Jonathan Nieder writes: > Stefan Beller wrote: > >> This bug fix also affects the default output (non-short, non-porcelain) >> of git-status, which is not tested here. > > Do you have an example? (In just the commit message would be fine, in > tests would be even better.) >

Re: [PATCH v5 4/6] dir_iterator: add tests for dir_iterator API

On Thu, Mar 30, 2017 at 5:05 AM, Michael Haggerty wrote: > Oh I forgot to mention, in the Git project we don't allow declarations > to be mixed with code. Apparently there's some ancient compiler > somewhere that doesn't allow it. Declarations always have to be > together,

Re: [PATCH v5 4/6] dir_iterator: add tests for dir_iterator API

On Thu, Mar 30, 2017 at 4:46 AM, Michael Haggerty wrote: > Is there a special reason to write the date to the file as opposed to, say > > touch dir/b > > ? (Some people use `: >dir/b` for this purpose, though I've never found > out why.) If you write the date to the

Re: [PATCH 0/18] snprintf cleanups

On Thu, Mar 30, 2017 at 10:24:36AM -0700, Junio C Hamano wrote: > > I'm OK either with the series I posted, or wrapping up the alternative > > in a commit message. > > I do find the updated one easier to follow (if anything it is more > compact); I do not think it is worth a reroll, but it is

Re: [PATCH 7/7] submodule.c: correctly handle nested submodules in is_submodule_modified

Jonathan Nieder writes: > Junio C Hamano wrote: > >> Shouldn't this done as part of 4/7 where is_submodule_modified() >> starts reading from the porcelain v2 output? 4/7 does adjust for >> the change from double question mark (porcelain v1) to a single one >> for untracked,

[PATCH v2] userdiff: add build-in pattern for shell

Shell are widely used but comes with lots of different patterns. The build-in pattern aim for POSIX-like shells with some additions: - Notably ${g//re/s} and ${g#cut} - Bashisms such as "function" Signed-off-by: Ivan Tham --- Documentation/gitattributes.txt | 2 ++

Re: [PATCH v2] log: if --decorate is not given, default to --decorate=auto

With the "--decorate=auto" option becoming the default for "git log", "git tbdiff" will be broken. The configuration variable has been already there, so in that sense this is not a new breakage (tbdiff wouldn't have worked well for those with configured default). A fix is trivial (attached). I

Re: [RFC PATCH] change default for status.submoduleSummary to true

On Wed, Mar 29, 2017 at 11:04 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> A user complained about the workflow with submodules: >>> Re submodules pain, I've seen a lot of people get confused about >>> how and when to commit submodule changes. The

Re: [PATCH] strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSD

Am 29.03.2017 um 06:54 schrieb Christian Couder: On Tue, Mar 28, 2017 at 11:49 PM, Jeff King wrote: On Tue, Mar 28, 2017 at 11:15:12PM +0200, Christian Couder wrote: On Sun, Mar 26, 2017 at 3:43 PM, René Scharfe wrote: FreeBSD implements getcwd(3) as a syscall,

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

On Thu, Mar 30, 2017 at 10:33 AM, Junio C Hamano wrote: >> >> Coverity points out that this is a leak (xgetcwd returns an allocated >> buffer). > > I saw that quite recently and was wondering why it reported it this > late. It has been in 'master' for more than a month.

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

Jeff King writes: > On Wed, Jan 27, 2016 at 07:58:00AM +0100, Christian Couder wrote: > >> diff --git a/builtin/update-index.c b/builtin/update-index.c >> index 6dd..369c207 100644 >> --- a/builtin/update-index.c >> +++ b/builtin/update-index.c >> @@ -130,7 +130,7 @@ static

Re: [PATCH v2 0/3] name-rev sanity

Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 29.03.2017 19:43: > ... >> Ah, of course, you are depending on your other topic ;-) >> I'll wiggle these in. >> >> Thanks. > > Yes, sorry, isn't that in next already? I should have meantioned it anyways. No worries.

Re: [PATCH v4 2/5] dir_iterator: iterate over dir after its contents

Michael Haggerty writes: > I don't think any of this needs to be implemented now, but maybe keep it > in mind if/when `dir_iterator` gets more users. OK. One thing that was missing in your list was the opposite of "do not show directories", i.e. "show only directories".

Re: [PATCH 0/18] snprintf cleanups

Jeff King writes: > On Wed, Mar 29, 2017 at 09:05:33AM -0700, Junio C Hamano wrote: > >> > I think there are two things going on in your example. >> > >> > One is that obviously patch_id_addf() removes the spaces from the >> > result. But we could do that now by keeping the big

ttk error when starting git gui

Hello, I get the following error when trying to start git gui: Error in startup script: wrong # args: should be "ttk::style theme use theme" while executing "ttk::style theme use" (procedure "ttext" line 4) invoked from within "ttext $ui_workdir -background white -foreground black

Re: [PATCH v2 1/2] pkt-line: add packet_writel() and packet_read_line_gently()

On 30.03.17 18:01, Ben Peart wrote: >> From: Torsten Bögershausen [mailto:tbo...@web.de] >> >> >> Does this work ? >> I would have expected >> packet_writel(fd, "line one", "line two", "line n"), NULL; Typo. Should have been: packet_writel(fd, "line one", "line two", "line n", NULL); >> > > No,

Re: [PATCH 2/7] Makefile: optionally compile with both SHA1DC and SHA1_OPENSSL

Junio C Hamano writes: > ... > The use of union is a good ingredient for a solution. I would have > chosen to do this slightly differently if I were doing it. > > typedef struct { > int safe; > union { >

Re: [PATCH 2/7] Makefile: optionally compile with both SHA1DC and SHA1_OPENSSL

Johannes Schindelin writes: > +#ifdef SHA1_DC_AND_OPENSSL > +void (*SHA1_Init_func)(SHA_CTX_union *ctx) = (void *)SHA1DCInit; > +void (*SHA1_Update_func)(SHA_CTX_union *ctx, const void *pointer, size_t > size) = > + (void *)git_SHA1DCUpdate; > +int

RE: [PATCH v2 1/2] pkt-line: add packet_writel() and packet_read_line_gently()

> From: Torsten Bögershausen [mailto:tbo...@web.de] > > > Does this work ? > I would have expected > packet_writel(fd, "line one", "line two", "line n"), NULL; > No, that's actually not valid C syntax. > > > > which requires the use of variable number of arguments. With your > proposal that

Re: [PATCH] read-cache: avoid git_path() race in freshen_shared_index()

Christian Couder writes: > On Wed, Mar 29, 2017 at 7:56 PM, Jeff King wrote: > ... >> Yeah, it looks like that is what happened. I see that Christian bisected >> the rebase to find the commit in the series that introduces the problem. >> I'm mildly

[PATCH v4 7/8] sub-process: move sub-process functions into separate files

Move the sub-proces functions into sub-process.h/c. Add documentation for the new module in Documentation/technical/api-sub-process.txt Signed-off-by: Ben Peart --- Documentation/technical/api-sub-process.txt | 54 + Makefile

[PATCH v4 8/8] convert: Update subprocess_read_status to not die on EOF

Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart --- convert.c

[PATCH v4 1/8] pkt-line: add packet_read_line_gently()

Add packet_read_line_gently() to enable reading a line without dying on EOF. Signed-off-by: Ben Peart --- pkt-line.c | 12 pkt-line.h | 10 ++ 2 files changed, 22 insertions(+) diff --git a/pkt-line.c b/pkt-line.c index d4b6bfe076..58842544b4 100644

[PATCH v4 3/8] convert: Split start_multi_file_filter into two separate functions

To enable future reuse of the filter..process infrastructure, split start_multi_file_filter into two separate parts. start_multi_file_filter will now only contain the generic logic to manage the creation and tracking of the child process in a hashmap. start_multi_file_filter_fn is a protocol

[PATCH v4 5/8] convert: Update generic functions to only use generic data structures

Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter specific functions. Signed-off-by: Ben Peart --- convert.c | 46

[PATCH v4 2/8] convert: move packet_write_list() into pkt-line as packet_writel()

Add packet_writel() which writes multiple lines in a single call and then calls packet_flush_gently(). Update convert.c to use the new packet_writel() function from pkt-line. Signed-off-by: Ben Peart --- convert.c | 23 ++- pkt-line.c | 19

[PATCH v4 4/8] convert: Separate generic structures and variables from the filter specific ones

To enable future reuse of the filter..process infrastructure, split the cmd2process structure into two separate parts. subprocess_entry will now contain the generic data required to manage the creation and tracking of the child process in a hashmap. Also move all knowledge of the hashmap into the

[PATCH v4 6/8] convert: rename reusable sub-process functions

Do a mechanical rename of the functions that will become the reusable sub-process module. Signed-off-by: Ben Peart --- convert.c | 47 --- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/convert.c b/convert.c

[PATCH v4 0/8] refactor the filter process code into a reusable module

Refactor the filter..process code into a separate sub-process module that can be used to reduce the cost of starting up a sub-process for multiple commands. It does this by keeping the external process running and processing all commands by communicating over standard input and standard output

[PATCH v4 2/8] convert: move packet_write_list() into pkt-line as packet_writel()

Add packet_writel() which writes multiple lines in a single call and then calls packet_flush_gently(). Update convert.c to use the new packet_writel() function from pkt-line. Signed-off-by: Ben Peart --- convert.c | 23 ++- pkt-line.c | 19

RE: [PATCH v3 7/8] sub-process: move sub-process functions into separate files

> From: Junio C Hamano [mailto:gits...@pobox.com] > > > diff --git a/sub-process.c b/sub-process.c new file mode 100644 index > > 00..2c4d27c193 > > --- /dev/null > > +++ b/sub-process.c > > @@ -0,0 +1,116 @@ > > +/* > > + * Generic implementation of background process infrastructure. > >

RE: [PATCH v3 0/8] refactor the filter process code into a reusable module

> From: Junio C Hamano [mailto:gits...@pobox.com] > > Ben Peart writes: > > > Ben Peart (8): > > pkt-line: add packet_writel() and packet_read_line_gently() > > convert: Update convert to use new packet_writel() function > > convert: Split start_multi_file_filter into

  1   2   >