Re: Git hackathon New York / London - call for mentors

Hi Charles, I maybe available to mentor. I am in Paris so closer to London. I have no date restriction for the weekends after April 9th yet. Thanks, Christian. On Wed, Mar 29, 2017 at 12:18 AM, Charles Bailey wrote: > Bloomberg would like to host a Git hackathon over a

[PATCH v2 3/3] name-rev: provide debug output

Currently, `git describe --contains --debug` does not create any debug output because it does not pass the flag down to `git name-rev`, which does not know that flag. Teach the latter that flag and the former to pass it down. The output is patterned after that of `git describe --debug`, with the

[PATCH v2 1/3] name-rev: refactor logic to see if a new candidate is a better name

From: Junio C Hamano When we encounter a new ref that could describe the commit we are looking at, we compare the name that is formed using that ref and the name we found so far and pick a better one. Factor the comparison logic out to a separate helper function, while

[PATCH v2 0/3] name-rev sanity

So here is v2 of the name-rev series, the result of our discussions being: Junio C Hamano (2): name-rev: refactor logic to see if a new candidate is a better name name-rev: favor describing with tags and use committer date to tiebreak That second patch is slighty changed as discussed,

[PATCH v2 2/3] name-rev: favor describing with tags and use committer date to tiebreak

From: Junio C Hamano "git name-rev" assigned a phony "far in the future" date to tips of refs that are not pointing at tag objects, and favored names based on a ref with the oldest date. This made it almost impossible for an unannotated tags and branches to be counted as a

[PATCH] perl: regenerate perl.mak if perl -V changes

Change the perl/perl.mak build process so that the file is re-made if the output of "perl -V" changes. Before this change updating e.g. /usr/bin/perl to a new major version would cause the next "make" command to fail, since perl.mak has hardcoded paths to perl library paths retrieved from its

[PATCH v2] perl: regenerate perl.mak if perl -V changes

Change the perl/perl.mak build process so that the file is re-made if the output of "perl -V" changes. Before this change updating e.g. /usr/bin/perl to a new major version would cause the next "make" command to fail, since perl.mak has hardcoded paths to perl library paths retrieved from its

Re: [PATCH v2 16/21] Make sha1_array_append take a struct object_id *

"brian m. carlson" writes: > On Tue, Mar 28, 2017 at 10:27:41AM -0700, Junio C Hamano wrote: >> ... >> After all, the original written by a human said E2[E3].hash (or >> array->sha1[i]) because to the human's mind, E2 is a series of >> things that can be indexed

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

Michael Haggerty writes: > I also realize that I made a goof in my comments about v3 of this patch > series. Your new option is not choosing between "depth-first" and > "breadth-first". Both types of iteration are depth-first. Really it is > choosing between pre-order and

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

Christian Couder writes: > 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. OK, that is an

[PATCH v3 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 v3 2/8] convert: Update convert to use new packet_writel() function

convert.c had it's own packet_write_list() function that can now be replaced with the new packet_writel() function from pkt-line. Signed-off-by: Ben Peart --- convert.c | 23 ++- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/convert.c

[PATCH v3 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 | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/convert.c b/convert.c

[PATCH v3 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 v3 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 functions. Signed-off-by: Ben Peart --- convert.c | 48

[PATCH v3 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 v3 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 v3 1/8] pkt-line: add packet_writel() and packet_read_line_gently()

Add packet_writel() which writes multiple lines in a single call and then calls packet_flush_gently(). Add packet_read_line_gently() to enable reading a line without dying on EOF. Signed-off-by: Ben Peart --- pkt-line.c | 31 +++ pkt-line.h |

[PATCH] 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-compatible shells with some additions: - Notably ${g//re/s} and ${g#cut} - "function" from bash Signed-off-by: Ivan Tham --- Documentation/gitattributes.txt | 2 ++

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

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 -I/usr/local/include -m64 -m64 -I. > -D__EXTENSIONS__ -D__sun__ -DUSE_LIBPCRE

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

Michael J Gruber writes: > So here is v2 of the name-rev series, the result of our discussions being: > > Junio C Hamano (2): > name-rev: refactor logic to see if a new candidate is a better name > name-rev: favor describing with tags and use committer date to > tiebreak

[PATCH v3 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 v3 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

Re: [PATCH 0/18] snprintf cleanups

Jeff King writes: > On Tue, Mar 28, 2017 at 03:33:48PM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >> > It's a lot of patches, but hopefully they're all pretty straightforward >> > to read. >> >> Yes, quite a lot of changes. I didn't see anything

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

On Wed, Mar 29, 2017 at 10:06:52AM -0700, Junio C Hamano wrote: > > This shows that we should be careful not to use git_path() in > > freshen_shared_index(). It is using a shared buffer that can > > too easily lead to races. > > The impression I get from the symptom is that after git_path() is >

Re: [PATCH v3] perl: regenerate perl.mak if perl -V changes

On Wed, Mar 29, 2017 at 01:57:03PM +, Ævar Arnfjörð Bjarmason wrote: > Change the perl/perl.mak build process so that the file is regenerated > if the output of "perl -V" changes. > > Before this change updating e.g. /usr/bin/perl to a new major version > would cause the next "make" command

Re: BUG: Renaming a branch checked out in a different work tree

On Mär 29 2017, Eyal Lotem wrote: > git version: 2.7.4 > installed from Ubuntu repos: > Ubuntu Version: 1:2.7.4-0ubuntu1 > > When renaming a branch checked out in a different work tree, that work > tree's state is corrupted. Git status in that work tree then reports >

[PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages

As the place holder in the error message is for multiple submodules, we don't want to encapsulate the string place holder in single quotes. Signed-off-by: Stefan Beller --- unpack-trees.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpack-trees.c

Re: [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly

Stefan Beller wrote: > In case of a non-forced worktree update, the submodule movement is tested > in a dry run first, such that it doesn't matter if the actual update is > done via the force flag. However for correctness, we want to give the > flag is specified by the user. "for correctness"

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

Ivan Tham writes: > Shell are widely used but comes with lots of different patterns. The > build-in pattern aim for POSIX-compatible shells with some additions: > > - Notably ${g//re/s} and ${g#cut} > - "function" from bash > > Signed-off-by: Ivan Tham

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

Junio C Hamano writes: > The first two applies cleanly to the same base as jc/name-rev that > the first two of these patches are meant to replace, but the third > one doesn't apply on top. Are you depending on something newer? Ah, of course, you are depending on your other

[PATCH 1/2] entry.c: submodule recursing: respect force flag correctly

In case of a non-forced worktree update, the submodule movement is tested in a dry run first, such that it doesn't matter if the actual update is done via the force flag. However for correctness, we want to give the flag is specified by the user. Signed-off-by: Stefan Beller

Re: BUG: Renaming a branch checked out in a different work tree

(+cc: Kazuki Yamaguchi --- thanks for writing the fix!) Hi Eyal, Eyal Lotem wrote: > git version: 2.7.4 > installed from Ubuntu repos: > Ubuntu Version: 1:2.7.4-0ubuntu1 > > When renaming a branch checked out in a different work tree, that work > tree's state is corrupted. Git status in that

Re: [PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages

Stefan Beller wrote: > As the place holder in the error message is for multiple submodules, > we don't want to encapsulate the string place holder in single quotes. Makes sense. > Signed-off-by: Stefan Beller > --- > unpack-trees.c | 2 +- > 1 file changed, 1 insertion(+),

BUG: Renaming a branch checked out in a different work tree

git version: 2.7.4 installed from Ubuntu repos: Ubuntu Version: 1:2.7.4-0ubuntu1 When renaming a branch checked out in a different work tree, that work tree's state is corrupted. Git status in that work tree then reports itself being on the "initial commit" with all files being in the staging

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

Suppose I have a superproject 'super', with two submodules 'super/sub' and 'super/sub1'. 'super/sub' itself contains a submodule 'super/sub/subsub'. Now suppose I run, from within 'super': echo hi >sub/subsub/stray-file echo hi >sub1/stray-file Currently we get would see the following

[PATCH 1/2] short status: improve reporting for submodule changes

If I add an untracked file to a submodule or modify a tracked file, currently "git status --short" treats the change in the same way as changes to the current HEAD of the submodule: $ git clone --quiet --recurse-submodules https://gerrit.googlesource.com/gerrit $ echo hello

[PATCHv9 (6,7)/7] short status: improve reporting for submodule changes

v9: * This is a resend of the last two patches, i.e. these two patches apply at 5c896f7c3ec (origin/sb/submodule-short-status^^) * below is a diff of this patch series against origin/sb/submodule-short-status * better tests, refined documentation, thanks for the review, Jonathan! Thanks, Stefan

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

On 03/29/2017 06:46 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> I also realize that I made a goof in my comments about v3 of this patch >> series. Your new option is not choosing between "depth-first" and >> "breadth-first". Both types of iteration are

Re: [PATCH v2] perl: regenerate perl.mak if perl -V changes

Am 29.03.2017 um 15:33 schrieb Ævar Arnfjörð Bjarmason: > Change the perl/perl.mak build process so that the file is re-made if > the output of "perl -V" changes. > > Before this change updating e.g. /usr/bin/perl to a new major version > would cause the next "make" command to fail, since

[PATCH v3] perl: regenerate perl.mak if perl -V changes

Change the perl/perl.mak build process so that the file is regenerated if the output of "perl -V" changes. Before this change updating e.g. /usr/bin/perl to a new major version would cause the next "make" command to fail, since perl.mak has hardcoded paths to perl library paths retrieved from its

Re: [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly

Jonathan Nieder writes: > Stefan Beller wrote: > >> In case of a non-forced worktree update, the submodule movement is tested >> in a dry run first, such that it doesn't matter if the actual update is >> done via the force flag. However for correctness, we want to give the >>

Re: [PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages

Jonathan Nieder writes: > Stefan Beller wrote: > >> As the place holder in the error message is for multiple submodules, >> we don't want to encapsulate the string place holder in single quotes. > > Makes sense. > >> Signed-off-by: Stefan Beller >> --- >>

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

Hi, On 03/29/2017 10:02 PM, Alex Hoffman wrote: > Any news about this patch? Haha nice, your initial patch is the same as mine (but mine was part of a bigger patch series and the v3 is probably going to have one less commit):

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

> sanity check: What does this do for a "2" line indicating a sub-submodule > that has been renamed that contains an untracked file? Do we need to > rely on some other indication to show this as a change? Oh. :( In case of 'u' and '2' we need to set DIRTY_SUBMODULE_MODIFIED additionally. will

Re: What's cooking in git.git (Mar 2017, #12; Wed, 29)

Junio C Hamano writes: > * mg/name-rev-debug (2017-03-29) 3 commits > - name-rev: provide debug output > - name-rev: favor describing with tags and use committer date to tiebreak > - name-rev: refactor logic to see if a new candidate is a better name > (this branch uses

Re: [PATCH v3] perl: regenerate perl.mak if perl -V changes

>>> Now the logic added in commit ee9be06770 ("perl: detect new files in >>> MakeMaker builds", 2012-07-27) is extended to regenerate >>> perl/perl.mak if there's any change to "perl -V". >> >> Nice. This fix is way simpler than I feared. >> >>> This will in some cases redundantly trigger

Re: [PATCH] unpack-trees.c: align submodule error message to the other error messages

Stefan Beller writes: > As the place holder in the error message is for multiple submodules, > we don't want to encapsulate the string place holder in single quotes. > > Signed-off-by: Stefan Beller > --- > >> Nitpicking about wording: unless the user has

Re: [PATCH v3] perl: regenerate perl.mak if perl -V changes

On Wed, Mar 29, 2017 at 8:12 PM, Jeff King wrote: > On Wed, Mar 29, 2017 at 01:57:03PM +, Ævar Arnfjörð Bjarmason wrote: > >> Change the perl/perl.mak build process so that the file is regenerated >> if the output of "perl -V" changes. >> >> Before this change updating e.g.

Re: [ANNOUNCE] Git for Windows 2.12.2

Hi Andrew, On Wed, 29 Mar 2017, Andrew Witte wrote: > The git 2.12 GCM for Windows is broken. I tried doing a git clone and > got "*remote: HTTP Basic: Access denied*". > I downgraded to git 2.11.0 and everything worked fine. Could you test v2.12.1, too, and open a bug report at:

What's cooking in git.git (Mar 2017, #12; Wed, 29)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: [PATCH v2 16/21] Make sha1_array_append take a struct object_id *

On Wed, Mar 29, 2017 at 08:14:19AM -0700, Junio C Hamano wrote: > This change is about dropping the need for ".hash", and I think a > faithful, boring and mechanical conversion that tries to preserve > the intent of the original author would be more appropriate. It is > entirely possible that

[PATCH] unpack-trees.c: align submodule error message to the other error messages

As the place holder in the error message is for multiple submodules, we don't want to encapsulate the string place holder in single quotes. Signed-off-by: Stefan Beller --- > Nitpicking about wording: unless the user has adopted a strongly > object-oriented point of view, it

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

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 two separate functions > convert: Separate generic structures

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

Any news about this patch? 2017-03-21 22:24 GMT+01:00 Alex Hoffman : > Hi, Brian, > > We definitely prefer the wrapper function oid_to_hex() to > sha1_to_hex(). Thanks for feedback. > Below is the updated patch: > > --- > bisect.c | 6 +++--- > 1 file changed, 3 insertions(+), 3

Re: [PATCH 0/7] PREVIEW: Introduce DC_AND_OPENSSL_SHA1 make flag

Hi Junio, On Fri, 24 Mar 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > - the most important part will be the patch turning core.enableSHA1DC > > into a tristate: "externalOnly" or "smart" or "auto" or something > > indicating that it switches on

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

Ben Peart writes: > +Types > +- > + > +'int(*subprocess_start_fn)(struct subprocess_entry *entry)':: > + > + User-supplied function to initialize the sub-process. This is > + typically used to negoiate the interface version and capabilities. > + > + > +Functions

Re: [PATCH v3] perl: regenerate perl.mak if perl -V changes

Ævar Arnfjörð Bjarmason writes: > We'll also redundantly trigger if you upgrade to a minor new perl > version, but I think that's squarely in "who cares" territory. > ... > But I think overall leaning on the side of busting the cache more > often to avoid cryptic errors is the

Re: [PATCH v2] travis-ci: build and test Git on Windows

Hi, On Fri, 24 Mar 2017, Sebastian Schuberth wrote: > On Fri, Mar 24, 2017 at 1:35 PM, Lars Schneider > wrote: > > >> 1. use appveyor.com, as that is a Travis-like service for Windows. We do > >> our > >> windows-builds in the curl project using that. > > > > The

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

So, like, Junio C Hamano said: > There are two topics that are marked as "Will cook in 'next'" for > practically forever in the "What's cooking" reports. The world may > have become ready for one or both of them, in which case we should > do the merge not too late in the cycle. > > *

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

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 main thing missing > in the related UIs is some way to summarize the subproject commit > diff in a human readable way. Maybe last

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

On Wed, Mar 29, 2017 at 6:20 PM, Stefan Beller wrote: > 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 main thing missing >> in the related UIs is some

Re: [PATCH v2 07/21] builtin/receive-pack: convert portions to struct object_id

On Wed, Mar 29, 2017 at 11:21:52PM +, brian m. carlson wrote: > On Tue, Mar 28, 2017 at 03:07:12AM -0400, Jeff King wrote: > > It took me a while to find it. This is the switch from "len == 48" to > > "len > 8" when matching "shallow" lines. I think this makes sense. > > > > > Note that in

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

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 marked as WIP, as it barely demonstrates how the code may look like. No tests, no documentation. Signed-off-by: Stefan Beller

[PATCH 2/3] column: allow for custom printf

Signed-off-by: Stefan Beller --- column.c | 13 - column.h | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/column.c b/column.c index 4851b9aa04..522e554f29 100644 --- a/column.c +++ b/column.c @@ -114,7 +114,9 @@ static void

[PATCH 1/3] column.c: pass column_options to down to display_plain

In a later patch we want to use more of the column_options members at places, where we do actual output, so it will be handy to have the whole struct around in `display_plain`. Signed-off-by: Stefan Beller --- column.c | 10 ++ 1 file changed, 6 insertions(+), 4

[PATCH 0/3] Respect column.ui in commented status in git-commit

When studying the code, I was nerd-sniped by the commit message of 4d2292e9a9 (status: refactor colopts handling, 2012-05-07) as I did not understand why it was so important to reset the s.colopts to 0 in builtin/commit.c. In my adolescent hybris I nearly sent out a patch claiming that line to be

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

Junio C Hamano wrote: > Ivan Tham writes: > > > Shell are widely used but comes with lots of different patterns. The > > build-in pattern aim for POSIX-compatible shells with some additions: > > > > - Notably ${g//re/s} and ${g#cut} > > - "function" from

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

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 int

[PATCH v5 0/6] [GSoC] remove_subtree(): reimplement using iterators

This is the fifth version of a patch series that implements the GSoC microproject of converting a recursive call to readdir() to use dir_iterator. v1: https://public-inbox.org/git/CAGZ79kZwT-9mHTiOJ5CEjk2wDFkn6+NcogjX0=vjhsah16a...@mail.gmail.com/T/#t v2:

[PATCH v5 3/6] dir_iterator: iterate over dir after its contents

Create an option for the dir_iterator API to iterate over subdirectories only after having iterated through their contents. This feature was predicted, although not implemented by 0fe5043 ("dir_iterator: new API for iterating over a directory tree", 2016-06-18). Add the "flags" parameter to

[PATCH v5 5/6] remove_subtree(): reimplement using iterators

From: Daniel Ferreira Use dir_iterator to traverse through remove_subtree()'s directory tree, avoiding the need for recursive calls to readdir(). Simplify remove_subtree()'s code. A conversion similar in purpose was previously done at 46d092a ("for_each_reflog():

[PATCH v5 6/6] remove_subtree(): test removing nested directories

Test removing a nested directory when an attempt is made to restore the index to a state where it does not exist. A similar test could be found previously in t/t2000-checkout-cache-clash.sh, but it did not check for nested directories, which could allow a faulty implementation of remove_subtree()

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

Create t/helper/test-dir-iterator.c, which prints relevant information about a directory tree iterated over with dir_iterator. Create t/t0065-dir-iterator.sh, which tests that dir_iterator does iterate through a whole directory tree and that post-order directory iteration is correctly

[PATCH v5 2/6] dir_iterator: refactor state machine model

Remove the "initialized" member of dir_iterator_level. Replace its functionality with a DIR_STATE_PUSH state in the dir_iterator_level.dir_state enum. This serves to remove a redundant property in the dir_iterator_level struct and ease comprehension of the state machine's behavior.

[PATCH v5 1/6] dir_iterator: add helpers to dir_iterator_advance

Create inline helpers to dir_iterator_advance(). Make dir_iterator_advance()'s code more legible and allow some behavior to be reusable. Signed-off-by: Daniel Ferreira --- dir-iterator.c | 65 +- 1 file changed, 42

Re: [PATCH 2/3] column: allow for custom printf

On Wed, Mar 29, 2017 at 06:42:37PM -0700, Stefan Beller wrote: > Signed-off-by: Stefan Beller No justification? I assume it will be used in a future patch. > diff --git a/column.h b/column.h > index 0a61917fa7..c44a1525a9 100644 > --- a/column.h > +++ b/column.h > @@ -24,6

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

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 marked as WIP, as it barely demonstrates how the code may look > like. No

Re: [PATCH 1/2] short status: improve reporting for submodule changes

Stefan Beller wrote: > Signed-off-by: Stefan Beller > Reviewed-by: Jonathan Nieder > --- > Documentation/git-status.txt | 11 > t/t3600-rm.sh| 18 +-- > t/t7506-status-submodule.sh | 117 >

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

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.) > Signed-off-by: Stefan Beller > ---

Re: [PATCH v2 07/21] builtin/receive-pack: convert portions to struct object_id

On Tue, Mar 28, 2017 at 03:07:12AM -0400, Jeff King wrote: > It took me a while to find it. This is the switch from "len == 48" to > "len > 8" when matching "shallow" lines. I think this makes sense. > > > Note that in queue_command we are guaranteed to have a NUL-terminated > > buffer or at

Re: [PATCH 0/7] PREVIEW: Introduce DC_AND_OPENSSL_SHA1 make flag

Johannes Schindelin writes: > - After the SHAttered blog post became public, Linus first made the case > that it matters not all that much: the development of the Linux kernel > is based on trust, and nobody would pull from a person they do not trust. > This

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

Hi Stefan & Daniel, On Tue, 28 Mar 2017, Stefan Beller wrote: > On Sat, Mar 25, 2017 at 8:15 PM, Daniel Ferreira (theiostream) > wrote: > > > SYNOPSIS > > There are many advantages to converting parts of git that are still > > scripts to C builtins, among which execution

Re: should git-subtree ignore submodules?

On Tue, Nov 01, 2016 at 12:41:50PM -0700, Kirill Katsnelson wrote: > "git-subtree add" fails to add the subtree into a repository with > submodules, reporting that the worktree is not clean, while `git status` > says that everything is clean (including submodules). I tracked the problem > down to

[PATCH] Makefile: detect errors in running spatch

The "make coccicheck" target runs spatch against each source file. But it does so in a for loop, so "make" never sees the exit code of spatch. Worse, it redirects stderr to a log file, so the user has no indication of any failure. And then to top it all off, because we touched the patch file's

Re: [PATCH] contrib/subtree: add "--no-commit" flag for merge and pull

I had defaulted it to "--commit" just to make it absolutely clear what the default was going to be, since passing the "--commit" flag to `git-merge` in this case doesn’t change the existing behavior. But you’re right that having the default be blank matches the existing style better, so I’ll

Re: [PATCH] contrib/subtree: add "--no-commit" flag for merge and pull

On Sun, Mar 26, 2017 at 03:02:38AM -0400, Mike Lewis wrote: > Allows the user to verify and/or change the contents of the merge > before committing as necessary > > Signed-off-by: Mike Lewis > --- > contrib/subtree/git-subtree.sh | 17 + > 1 file changed, 13

[PATCH] read-cache: avoid git_path() race 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. When bisecting it appears that 94c9b5af70 (Merge branch 'cc/split-index-config',

Re: [PATCH v4 5/5] files_reflog_iterator: amend use of dir_iterator

On 03/29/2017 02:32 AM, Daniel Ferreira wrote: > Amend a call to dir_iterator_begin() to pass the flags parameter > introduced in 3efb5c0 ("dir_iterator: iterate over dir after its > contents", 2017-28-03). > > Signed-off-by: Daniel Ferreira > --- > refs/files-backend.c | 2 +-

Re: [PATCH v6 18/27] files-backend: replace submodule_allowed check in files_downcast()

On 03/26/2017 04:16 AM, Duy Nguyen wrote: > On Mon, Mar 20, 2017 at 4:18 AM, Michael Haggerty > wrote: >>> +/* ref_store_init flags */ >>> +#define REF_STORE_READ (1 << 0) >> >> I asked [1] in reply to v5 whether `REF_STORE_READ` is really necessary >> but I

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

On 03/29/2017 11:56 AM, Michael Haggerty wrote: > On 03/29/2017 02:32 AM, Daniel Ferreira wrote: >> [...] > [...] > The disagreement is not a surprise, because there isn't a corresponding > coding error in the code below that returns the directory itself in a > post-order iteration. The net result

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

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 -I/usr/local/include -m64 -m64 -I. -D__EXTENSIONS__ -D__sun__ -DUSE_LIBPCRE -I/usr/local/include -DHAVE_ALLOCA_H -I/usr/local/include

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

On 03/29/2017 02:32 AM, Daniel Ferreira wrote: > Create an option for the dir_iterator API to iterate over subdirectories > only after having iterated through their contents. This feature was > predicted, although not implemented by 0fe5043 ("dir_iterator: new API > for iterating over a directory

Re: [PATCH v4 3/5] remove_subtree(): reimplement using iterators

On 03/29/2017 02:32 AM, Daniel Ferreira wrote: > Use dir_iterator to traverse through remove_subtree()'s directory tree, > avoiding the need for recursive calls to readdir(). Simplify > remove_subtree()'s code. > > A conversion similar in purpose was previously done at 46d092a >

FROM AISHA GADDAFI

for more details,contact me at my private email : agaddafi752(at)gmail. com Dr. Aisha Gaddafi, the daughter of late Libyan president, I need a partner or an investor that will help me in investing the sum of $87.5 million USD in his or her country, the funds is deposited here in Burkina Faso

Re: [PATCH v2 2/3] sequencer: make commit options more extensible

Hi Junio, On Mon, 27 Mar 2017, Junio C Hamano wrote: > Junio C Hamano writes: > > > As this thing is about fixing a regression visible to end users, I > > may get around to fixing things up myself, but I have other topics > > to attend to, so... > > So I ended up with this