`git stash --help` tries to pull up nonexistent file gitstack.html

2016-08-11 Thread Joseph Musser
Looks like a simple typo. Joseph Musser -- 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

[PATCHv2] checkout: do not mention detach advice for explicit --detach option

2016-08-11 Thread Stefan Beller
When a user asked for a detached HEAD specifically with `--detach`, we do not need to give advice on what a detached HEAD state entails as we can assume they know what they're getting into as they asked for it. Signed-off-by: Stefan Beller --- jrnieder wrote: > Examples?

[PATCHv4 6/8] clone: clarify option_reference as required

2016-08-11 Thread Stefan Beller
In the next patch we introduce optional references; To better distinguish between optional and required references we rename the variable. Signed-off-by: Stefan Beller --- builtin/clone.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[PATCHv4 7/8] clone: implement optional references

2016-08-11 Thread Stefan Beller
In a later patch we want to try to create alternates for submodules, but they might not exist in the referenced superproject. So add a way to skip the non existing references and report them. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 5 -

[PATCHv4 5/8] clone: factor out checking for an alternate path

2016-08-11 Thread Stefan Beller
In a later patch we want to determine if a path is suitable as an alternate from other commands than builtin/clone. Move the checking functionality of `add_one_reference` to `compute_alternate_path` that is defined in cache.h. Signed-off-by: Stefan Beller --- builtin/clone.c

[PATCHv4 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-11 Thread Stefan Beller
When `--recursive` and `--reference` is given, it is reasonable to expect that the submodules are created with references to the submodules of the given alternate for the superproject. An initial attempt to do this was presented to the mailing list, which used flags that are passed around

[PATCHv4 2/8] t7408: merge short tests, factor out testing method

2016-08-11 Thread Stefan Beller
Tests consisting of one line each can be consolidated to have fewer tests to run as well as fewer lines of code. When having just a few git commands, do not create a new shell but use the -C flag in Git to execute in the correct directory. Signed-off-by: Stefan Beller ---

[PATCHv4 3/8] submodule--helper module-clone: allow multiple references

2016-08-11 Thread Stefan Beller
Allow users to pass in multiple references, just as clone accepts multiple references as well. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/builtin/submodule--helper.c

[PATCHv4 4/8] submodule--helper update-clone: allow multiple references

2016-08-11 Thread Stefan Beller
Allow the user to pass in multiple references to update_clone. Currently this is only internal API, but once the shell script is replaced by a C version, this is needed. This fixes an API bug between the shell script and the helper. Currently the helper accepts "--reference" "--reference=foo" as

[PATCHv4 0/6] git clone: Marry --recursive and --reference

2016-08-11 Thread Stefan Beller
v4: Thanks to Junios critial questions regarding the design, I took a step back to look at the bigger picture, again. new patches: clone: factor out checking for an alternate path clone: recursive and reference option triggers submodule alternates The last patch redesigns completely how we

[PATCHv4 1/8] t7408: modernize style

2016-08-11 Thread Stefan Beller
No functional change intended. This commit only changes formatting to the style we recently use, e.g. starting the body of a test with a single quote on the same line as the header, and then having the test indented in the following lines. Whenever we change directories, we do that in subshells.

[PATCH v5 00/12] Update git revisions

2016-08-11 Thread Philip Oakley
This has grown like topsy from a little two patch series that tried to name the 2-dots notation [1] into this extended set of tweaks. As documentation can be rather personal, I've split out each small change so each can be individually justified. Since V4, I've confirmed that the format breaking

[PATCH v5 01/12] doc: use 'symmetric difference' consistently

2016-08-11 Thread Philip Oakley
Signed-off-by: Philip Oakley --- unchanged --- Documentation/gitk.txt | 2 +- Documentation/rev-list-options.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 6ade002..6c3eb15

Re: [PATCH v5 00/12] Update git revisions

2016-08-11 Thread Philip Oakley
I'm having trouble with my ISP is not playing ball. only cover and patch 1 were sent. Will retry with alternate service. Philip - Original Message - From: "Philip Oakley" Sent: Thursday, August 11, 2016 10:50 PM Subject: [PATCH v5 00/12] Update git revisions

[PATCH v5 2/3] diff: add --diff-line-prefix option for passing in a prefix

2016-08-11 Thread Jacob Keller
From: Jacob Keller Add an option to pass additional prefix to be displayed before diff output. This feature will be used in a following patch to output correct --graph prefix when using a child_process/run_command interface for submodules. The prefix shall come first

[PATCH v5 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-11 Thread Jacob Keller
From: Jacob Keller Teach git-diff and friends a new format for displaying the difference of a submodule using git-diff inside the submodule project. This allows users to easily see exactly what source changed in a given commit that updates the submodule pointer. To do

[PATCH v5 1/3] diff.c: remove output_prefix_length field

2016-08-11 Thread Jacob Keller
From: Junio C Hamano "diff/log --stat" has a logic that determines the display columns available for the diffstat part of the output and apportions it for pathnames and diffstat graph automatically. 5e71a84a (Add output_prefix_length to diff_options, 2012-04-16) added the

Re: Issue with global config defaults "user.useConfigOnly = true" + "pull.rebase = preserve" - "user.email"

2016-08-11 Thread Junio C Hamano
Earlier, Peff sent this patch (slightly buried in a discussion) on "rebase -i" in <20160729223134.ga22...@sigill.intra.peff.net>. > Subject: rebase-interactive: drop early check for valid ident > > Since the very inception of interactive-rebase in 1b1dce4 > (Teach rebase an interactive mode,

Re: public-inbox.org/git updates

2016-08-11 Thread Eric Wong
Junio C Hamano wrote: > Eric Wong writes: > > > There'll be over 5000K injected messages from 2006 I missed from > > the initial import :x > > > > I noticed this while adding gmane: mapping support to the > > search engine: > >

Re: Mapping old gmane numbers to existing amil servers?

2016-08-11 Thread Eric Wong
Philip Oakley wrote: > The raw download works. My home ISP is currently blocking your email for > some reason, though I do see it at my work - my iee.org alias is via my > professional body which duplicates the email when it relays it. Hmm, do other emails from other users

What's cooking in git.git (Aug 2016, #04; Thu, 11)

2016-08-11 Thread Junio C Hamano
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. The 'maint' branch has been

[PATCH v5 01/12] doc: use 'symmetric difference' consistently

2016-08-11 Thread Philip Oakley
Signed-off-by: Philip Oakley --- unchanged --- Documentation/gitk.txt | 2 +- Documentation/rev-list-options.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 6ade002..6c3eb15

[PATCH v5 00/12] Update git revisions

2016-08-11 Thread Philip Oakley
This has grown like topsy from a little two patch series that tried to name the 2-dots notation [1] into this extended set of tweaks. As documentation can be rather personal, I've split out each small change so each can be individually justified. Since V4, I've confirmed that the format breaking

Re: Mapping old gmane numbers to existing amil servers?

2016-08-11 Thread Philip Oakley
From: "Eric Wong" Sent: Thursday, August 11, 2016 8:56 AM Philip Oakley wrote: Is there an accessible mapping from the old gmane message numbers to one of the remaining email list servers for the git list? Yes, I just posted about this after posting an

Re: [PATCH v7 0/9] status: V2 porcelain status

2016-08-11 Thread Junio C Hamano
Jeff Hostetler writes: > From: Jeff Hostetler > > This patch series adds porcelain V2 format to status. > This provides detailed information about file changes > and about the current branch. > > The new output is accessed via: > git status

[PATCH v7 6/9] status: print branch info with --porcelain=v2 --branch

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Expand porcelain v2 output to include branch and tracking branch information. This includes the commit id, the branch, the upstream branch, and the ahead and behind counts. Signed-off-by: Jeff Hostetler --- builtin/commit.c

[PATCH v7 5/9] status: print per-file porcelain v2 status data

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Print per-file information in porcelain v2 format. Signed-off-by: Jeff Hostetler --- wt-status.c | 285 +++- 1 file changed, 284 insertions(+), 1 deletion(-) diff

[PATCH v7 3/9] status: support --porcelain[=]

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Update --porcelain argument to take optional version parameter to allow multiple porcelain formats to be supported in the future. The token "v1" is the default value and indicates the traditional porcelain format. (The token "1" is an alias for

[PATCH v7 1/9] status: rename long-format print routines

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Rename the various wt_status_print*() routines to be wt_longstatus_print*() to make it clear that these routines are only concerned with the normal/long status output and reduce developer confusion as other status formats are added in the future.

Re: [PATCH v6 9/9] status: unit tests for --porcelain=v2

2016-08-11 Thread Jeff Hostetler
On 08/11/2016 02:36 PM, Junio C Hamano wrote: Jeff Hostetler writes: From: Jeff Hostetler +. ./test-lib.sh + +OID_EMPTY=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 It seems that test-lib.sh these days has EMPTY_BLOB defined for your use. You

Re: [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix

2016-08-11 Thread Junio C Hamano
Subject: SQUASH??? clarify the if/{if/else} nesting Otherwise GCC helpfully warns you. Signed-off-by: Junio C Hamano --- diff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diff.c b/diff.c index bfc0a6b..d128b9d 100644 --- a/diff.c +++ b/diff.c @@

[PATCH v7 4/9] status: collect per-file data for --porcelain=v2

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Collect extra per-file data for porcelain V2 format. The output of `git status --porcelain` leaves out many details about the current status that clients might like to have. This can force them to be less efficient as they may need to launch

[PATCH v7 7/9] git-status.txt: describe --porcelain=v2 format

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Update status manpage to include information about porcelain v2 format. Signed-off-by: Jeff Hostetler --- Documentation/git-status.txt | 126 +-- 1 file changed, 122 insertions(+), 4

[PATCH v7 2/9] status: cleanup API to wt_status_print

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Refactor the API between builtin/commit.c and wt-status.[ch]. Hide the details of the various wt_*status_print() routines inside wt-status.c behind a single (new) wt_status_print() routine. Eliminate the switch statements from builtin/commit.c. Allow

[PATCH v7 9/9] status: unit tests for --porcelain=v2

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Test porcelain v2 status format. Signed-off-by: Jeff Hostetler --- t/t7064-wtstatus-pv2.sh | 592 1 file changed, 592 insertions(+) create mode 100755 t/t7064-wtstatus-pv2.sh

[PATCH v7 8/9] test-lib-functions.sh: Add lf_to_nul

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Add lf_to_nul() function to test-lib-functions. Signed-off-by: Jeff Hostetler --- t/test-lib-functions.sh | 4 1 file changed, 4 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index

[PATCH v7 0/9] status: V2 porcelain status

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler This patch series adds porcelain V2 format to status. This provides detailed information about file changes and about the current branch. The new output is accessed via: git status --porcelain=v2 [--branch] This v7 patch series address the most

Warning: You tried to send an email with blocked content

2016-08-11 Thread Service Desk
The UCL E-Mail Virus Protection System has been triggered by a message you sent. One or more of the original e-mail attachments have been removed and replaced with this message. * The attachment may have contained a virus or malware * The attachment may have an extension of a type unacceptable

Re: [PATCH v4 2/2] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-11 Thread Junio C Hamano
Jacob Keller writes: > diff --git a/submodule.c b/submodule.c > index 1b5cdfb7e784..36f8fd00c3ce 100644 > --- a/submodule.c > +++ b/submodule.c > @@ -333,6 +333,73 @@ static void print_submodule_summary(struct rev_info > *rev, FILE *f, > strbuf_release(); > } >

Re: public-inbox.org/git updates

2016-08-11 Thread Junio C Hamano
Eric Wong writes: > There'll be over 5000K injected messages from 2006 I missed from > the initial import :x > > I noticed this while adding gmane: mapping support to the > search engine: > https://public-inbox.org/git/20160811002819.GA8311@starla/T/#u > > There will still

Re: [PATCH v12 12/13] apply: learn to use a different index file

2016-08-11 Thread Junio C Hamano
Christian Couder writes: > Sometimes we want to apply in a different index file. > > Before the apply functionality was libified it was possible to > use the GIT_INDEX_FILE environment variable, for this purpose. > > But now, as the apply functionality has been

Re: [PATCH] submodule: mark a file-local symbol as static

2016-08-11 Thread Stefan Beller
On Thu, Aug 11, 2016 at 12:57 PM, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Stefan, > > If you need to re-roll your 'sb/submodule-clone-rr' branch, could > you please squash this into the relevant patch (commit

[PATCH] submodule: mark a file-local symbol as static

2016-08-11 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/submodule-clone-rr' branch, could you please squash this into the relevant patch (commit 336c21d, "submodule: try alternates when superproject has an alternate", 08-08-2016). Thanks! ATB,

public-inbox.org/git updates

2016-08-11 Thread Eric Wong
This mainly affects the folks following the top-level Atom feed at https://public-inbox.org/git/new.atom or over NNTP. There'll be over 5000K injected messages from 2006 I missed from the initial import :x I noticed this while adding gmane: mapping support to the search engine:

Re: t0027 racy?

2016-08-11 Thread Junio C Hamano
Torsten Bögershausen writes: > Good ideas, I will work on a series that fixes bugs first, and then we > can see if there is room for optimization. > > What do you think about this as a starting point, more things will > follow. > I like to here comments about the commit msg first

Re: [PATCH v10 33/40] environment: add set_index_file()

2016-08-11 Thread Junio C Hamano
Christian Couder writes: > Yeah, it is feasible and perhaps even simpler using > hold_lock_file_for_update() than with set_index_file(), so I > dropped the set_index_file() patch and added a new one that uses > hold_lock_file_for_update(). I wasn't paying too close

Re: Can cc's be included in patches sent by send-email

2016-08-11 Thread Philip Oakley
From: "Junio C Hamano" Jacob Keller writes: On Thu, Aug 11, 2016 at 12:58 AM, Jacob Keller wrote: On Thu, Aug 11, 2016 at 12:32 AM, Philip Oakley wrote: While 'git send-email' can have multiple

Re: [PATCH v10 33/40] environment: add set_index_file()

2016-08-11 Thread Christian Couder
On Wed, Aug 10, 2016 at 7:34 PM, Junio C Hamano wrote: > Christian Couder writes: > >>> Isn't the mention on NO_THE_INDEX_COMPATIBILITY_MACROS in the added >>> comments (there are two) pure red-herring? >> >> Yeah, true. >> >> So do you want me to

Re: [PATCH v6 0/9] status: V2 porcelain status

2016-08-11 Thread Junio C Hamano
Jeff Hostetler writes: > From: Jeff Hostetler > > This patch series adds porcelain V2 format to status. > This provides detailed information about file changes > and about the current branch. Everything up to 8/9 I didn't have anything to comment

Re: t0027 racy?

2016-08-11 Thread Torsten Bögershausen
[] > FWIW I would strongly prefer to use the warning of `git add` and not even > bother with `git commit`. What we are interested in is the warning > message, generated by convert_to_git(). The commit is needed, because we check the content of the commit later. > Not using the first one and [] >

Re: Can cc's be included in patches sent by send-email

2016-08-11 Thread Philip Oakley
From: "Jacob Keller" On Thu, Aug 11, 2016 at 12:58 AM, Jacob Keller wrote: On Thu, Aug 11, 2016 at 12:32 AM, Philip Oakley wrote: While 'git send-email' can have multiple --cc="addressee" options on the command line, is

Re: [PATCH] gc: default aggressive depth to 50

2016-08-11 Thread Junio C Hamano
Jeff King writes: > On Thu, Aug 11, 2016 at 12:13:09PM -0400, Jeff King wrote: > >> Here are the numbers for linux.git: >> >>depth | size | %| rev-list | % | log -Sfoo | % >> ---+---+---+--++---+--- >> 250 | 967MB |

[PATCH v12 13/13] builtin/am: use apply API in run_apply()

2016-08-11 Thread Christian Couder
This replaces run_apply() implementation with a new one that uses the apply API that has been previously prepared in apply.c and apply.h. This shoud improve performance a lot in certain cases. As the previous implementation was creating a new `git apply` process to apply each patch, it could be

[PATCH v12 10/13] apply: change error_routine when silent

2016-08-11 Thread Christian Couder
To avoid printing anything when applying with `state->apply_verbosity == verbosity_silent`, let's save the existing warn and error routines before applying, and let's replace them with a routine that does nothing. Then after applying, let's restore the saved routines. Helped-by: Stefan Beller

[PATCH v12 08/13] usage: add set_warn_routine()

2016-08-11 Thread Christian Couder
There are already set_die_routine() and set_error_routine(), so let's add set_warn_routine() as this will be needed in a following commit. Signed-off-by: Christian Couder --- git-compat-util.h | 1 + usage.c | 5 + 2 files changed, 6 insertions(+) diff

[PATCH v12 09/13] usage: add get_error_routine() and get_warn_routine()

2016-08-11 Thread Christian Couder
Let's make it possible to get the current error_routine and warn_routine, so that we can store them before using set_error_routine() or set_warn_routine() to use new ones. This way we will be able put back the original routines, when we are done with using new ones. Signed-off-by: Christian

[PATCH v12 11/13] apply: refactor `git apply` option parsing

2016-08-11 Thread Christian Couder
Parsing `git apply` options can be useful to other commands that want to call the libified apply functionality, because this way they can easily pass some options from their own command line to the libified apply functionality. This will be used by `git am` in a following patch. To make this

[PATCH v12 12/13] apply: learn to use a different index file

2016-08-11 Thread Christian Couder
Sometimes we want to apply in a different index file. Before the apply functionality was libified it was possible to use the GIT_INDEX_FILE environment variable, for this purpose. But now, as the apply functionality has been libified, it should be possible to do that in a libified way.

[PATCH v12 06/13] apply: make it possible to silently apply

2016-08-11 Thread Christian Couder
This changes 'int apply_verbosely' into 'enum apply_verbosity', and changes the possible values of the variable from a bool to a tristate. The previous 'false' state is changed into 'verbosity_normal'. The previous 'true' state is changed into 'verbosity_verbose'. The new added state is

[PATCH v12 01/13] builtin/apply: rename option parsing functions

2016-08-11 Thread Christian Couder
As these functions are going to be part of the libified apply API, let's give them a name that is more specific to the apply API. Signed-off-by: Christian Couder --- builtin/apply.c | 40 1 file changed, 20 insertions(+), 20

[PATCH v12 02/13] apply: rename and move opt constants to apply.h

2016-08-11 Thread Christian Couder
The constants for the "inaccurate-eof" and the "recount" options will be used in both "apply.c" and "builtin/apply.c", so they need to go into "apply.h", and therefore they need a name that is more specific to the API they belong to. Signed-off-by: Christian Couder ---

[PATCH v12 00/13] libify apply and use lib in am, part 3

2016-08-11 Thread Christian Couder
Goal This is a patch series about libifying `git apply` functionality, and using this libified functionality in `git am`, so that no 'git apply' process is spawn anymore. This makes `git am` significantly faster, so `git rebase`, when it uses the am backend, is also significantly faster.

[PATCH v12 04/13] apply: make some parsing functions static again

2016-08-11 Thread Christian Couder
Some parsing functions that were used in both "apply.c" and "builtin/apply.c" are now only used in the former, so they can be made static to "apply.c". Signed-off-by: Christian Couder --- apply.c | 6 +++--- apply.h | 5 - 2 files changed, 3 insertions(+), 8

[PATCH v12 07/13] apply: don't print on stdout in verbosity_silent mode

2016-08-11 Thread Christian Couder
When apply_verbosity is set to verbosity_silent nothing should be printed on both stderr and stdout. To avoid printing on stdout, we can just skip calling the following functions: - stat_patch_list(), - numstat_patch_list(), - summary_patch_list(). It is safe to do that

[PATCH v12 05/13] apply: use error_errno() where possible

2016-08-11 Thread Christian Couder
To avoid possible mistakes and to uniformly show the errno related messages, let's use error_errno() where possible. Signed-off-by: Christian Couder --- apply.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apply.c b/apply.c

Re: [PATCH v6 9/9] status: unit tests for --porcelain=v2

2016-08-11 Thread Junio C Hamano
Jeff Hostetler writes: > From: Jeff Hostetler > > Test porcelain v2 status format. > > Signed-off-by: Jeff Hostetler > --- > t/t7064-wtstatus-pv2.sh | 576 > > 1 file

Re: [PATCH v4 2/2] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-11 Thread Jacob Keller
On Thu, Aug 11, 2016 at 10:53 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> From: Jacob Keller >> >> Teach git-diff and friends a new format for displaying the difference of >> a submodule using git-diff inside the

Re: [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix

2016-08-11 Thread Jacob Keller
On Thu, Aug 11, 2016 at 10:22 AM, Junio C Hamano wrote: > -- >8 -- > Subject: diff.c: remove output_prefix_length field > > "diff/log --stat" has a logic that determines the display columns > available for the diffstat part of the output and apportions it for > pathnames and

Re: [PATCH] checkout: do not mention detach advice for explicit --detach option

2016-08-11 Thread Junio C Hamano
Stefan Beller writes: > On Wed, Aug 10, 2016 at 10:32 AM, Jonathan Nieder wrote: >> Stefan Beller wrote: >> >>> When a user asked for a detached HEAD specifically with `--detach`, >>> we do not need to give advice on what a detached HEAD state entails as

Re: Can cc's be included in patches sent by send-email

2016-08-11 Thread Junio C Hamano
On Thu, Aug 11, 2016 at 10:57 AM, Junio C Hamano wrote: > > Also, those who do not want to see Cc: in headers (like me) can Stupid typo that ruins the whole message. I meant "in FOOTERS". > instead edit the header part of the format-patch output to add Cc: > lines and they

Re: Can cc's be included in patches sent by send-email

2016-08-11 Thread Junio C Hamano
Jacob Keller writes: > On Thu, Aug 11, 2016 at 12:58 AM, Jacob Keller wrote: >> On Thu, Aug 11, 2016 at 12:32 AM, Philip Oakley wrote: >>> While 'git send-email' can have multiple --cc="addressee" options on the >>> command

Re: [ANNOUNCE] tig-2.2

2016-08-11 Thread Junio C Hamano
Jonas Fonseca writes: > I've just released the 35th release of Tig. It brings several search > improvements such as highlighting and wrap around, and machinery for future > support of typeahead search. This release also gives more choice over how the > user configuration

Re: [PATCH v4 2/2] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-11 Thread Junio C Hamano
Jacob Keller writes: > From: Jacob Keller > > Teach git-diff and friends a new format for displaying the difference of > a submodule using git-diff inside the submodule project. This allows > users to easily see exactly what source changed in a

Re: [PATCH v11 28/40] builtin/apply: rename option parsing functions

2016-08-11 Thread Christian Couder
On Thu, Aug 11, 2016 at 10:58 AM, wrote: > Am 11.08.2016 um 10:52 schrieb Christian Couder: >> As these functions are going to be part of the libified >> apply api, let's give them a name that is more specific > > s/api/API/ > > ;-) Ooops. Anyway as this is

Re: [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix

2016-08-11 Thread Junio C Hamano
Jacob Keller writes: > const char *diff_line_prefix(struct diff_options *opt) > { > struct strbuf *msgbuf; > + > if (!opt->output_prefix) > - return ""; > + if (opt->line_prefix) > + return opt->line_prefix; > +

Re: [PATCH] gc: default aggressive depth to 50

2016-08-11 Thread Jeff King
On Thu, Aug 11, 2016 at 12:13:09PM -0400, Jeff King wrote: > Here are the numbers for linux.git: > >depth | size | %| rev-list | % | log -Sfoo | % > ---+---+---+--++---+--- > 250 | 967MB | n/a | 48.159s | n/a | 378.088 |

Re: [PATCH v5] pack-objects mru

2016-08-11 Thread Jeff King
On Thu, Aug 11, 2016 at 08:11:33AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > So considering "--depth" as a space-saving measure for --aggressive does > > not seem that effective. But it feels weird to quietly drop actions > > people might have done with previous

[PATCH] gc: default aggressive depth to 50

2016-08-11 Thread Jeff King
This commit message is long and has lots of background and numbers. The summary is: the current default of 250 doesn't save much space, and costs CPU. It's not a good tradeoff. Read on for details. The "--aggressive" flag to git-gc does three things: 1. use "-f" to throw out existing deltas

Re: [PATCH v5] pack-objects mru

2016-08-11 Thread Junio C Hamano
Jeff King writes: > So considering "--depth" as a space-saving measure for --aggressive does > not seem that effective. But it feels weird to quietly drop actions > people might have done with previous aggressive runs. That argument cuts both ways, doesn't it? If the user

[PATCH v6 8/9] test-lib-functions.sh: Add lf_to_nul

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Add lf_to_nul() function to test-lib-functions. Signed-off-by: Jeff Hostetler --- t/test-lib-functions.sh | 4 1 file changed, 4 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index

[PATCH v6 7/9] git-status.txt: describe --porcelain=v2 format

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Update status manpage to include information about porcelain v2 format. Signed-off-by: Jeff Hostetler --- Documentation/git-status.txt | 126 +-- 1 file changed, 122 insertions(+), 4

[PATCH v6 5/9] status: print per-file porcelain v2 status data

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Print per-file information in porcelain v2 format. Signed-off-by: Jeff Hostetler --- wt-status.c | 285 +++- 1 file changed, 284 insertions(+), 1 deletion(-) diff

[PATCH v6 9/9] status: unit tests for --porcelain=v2

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Test porcelain v2 status format. Signed-off-by: Jeff Hostetler --- t/t7064-wtstatus-pv2.sh | 576 1 file changed, 576 insertions(+) create mode 100755 t/t7064-wtstatus-pv2.sh

[PATCH v6 4/9] status: collect per-file data for --porcelain=v2

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Collect extra per-file data for porcelain V2 format. The output of `git status --porcelain` leaves out many details about the current status that clients might like to have. This can force them to be less efficient as they may need to launch

[PATCH v6 1/9] status: rename long-format print routines

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Rename the various wt_status_print*() routines to be wt_longstatus_print*() to make it clear that these routines are only concerned with the normal/long status output and reduce developer confusion as other status formats are added in the future.

[PATCH v6 2/9] status: cleanup API to wt_status_print

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Refactor the API between builtin/commit.c and wt-status.[ch]. Hide the details of the various wt_*status_print() routines inside wt-status.c behind a single (new) wt_status_print() routine. Eliminate the switch statements from builtin/commit.c. Allow

[PATCH v6 6/9] status: print branch info with --porcelain=v2 --branch

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Expand porcelain v2 output to include branch and tracking branch information. This includes the commit id, the branch, the upstream branch, and the ahead and behind counts. Signed-off-by: Jeff Hostetler --- builtin/commit.c

[PATCH v6 0/9] status: V2 porcelain status

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler This patch series adds porcelain V2 format to status. This provides detailed information about file changes and about the current branch. The new output is accessed via: git status --porcelain=v2 [--branch] This v6 patch series addresses the

[PATCH v6 3/9] status: support --porcelain[=]

2016-08-11 Thread Jeff Hostetler
From: Jeff Hostetler Update --porcelain argument to take optional version parameter to allow multiple porcelain formats to be supported in the future. The token "v1" is the default value and indicates the traditional porcelain format. (The token "1" is an alias for

Re: [PATCH] guilt: update reflog with annotations of guilt-command being run

2016-08-11 Thread Josef 'Jeff' Sipek
On Sat, Jul 09, 2016 at 18:16:05 -0400, Theodore Ts'o wrote: > Many of the updates made by guilt use git update-ref, which means that > the output of "git reflog" is extremely unedifying, e.g: This has been an annoyance for me as well. Thanks for fixing it. I'll give it a test run, and likely

*RE: Deposit|Charitable Gesture

2016-08-11 Thread Susanne Klatten
Hello Sir/Madam, Your 3.7 million USD deposit from Susanne Klatten 50M Philanthropic Donation is ready. Contact: susannecharityfoundat...@aol.de -- 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

Re: [PATCH v5] pack-objects mru

2016-08-11 Thread Jeff King
On Thu, Aug 11, 2016 at 05:20:30AM -0400, Jeff King wrote: > Here it is. It ended up needing a few preparatory patches. > > [1/4]: provide an initializer for "struct object_info" > [2/4]: sha1_file: make packed_object_info public > [3/4]: pack-objects: break delta cycles before

[PATCH v5 4/4] pack-objects: use mru list when iterating over packs

2016-08-11 Thread Jeff King
In the original implementation of want_object_in_pack(), we always looked for the object in every pack, so the order did not matter for performance. As of the last few patches, however, we can now often break out of the loop early after finding the first instance, and avoid looking in the other

[PATCH v5 3/4] pack-objects: break delta cycles before delta-search phase

2016-08-11 Thread Jeff King
We do not allow cycles in the delta graph of a pack (i.e., A is a delta of B which is a delta of A) for the obvious reason that you cannot actually access any of the objects in such a case. There's a last-ditch attempt to notice cycles during the write phase, during which we issue a warning to

[PATCH v5 2/4] sha1_file: make packed_object_info public

2016-08-11 Thread Jeff King
Some code may have a pack/offset pair for an object, but would like to look up more information. Using sha1_object_info() is too heavy-weight; it starts from the sha1 and has to find the pack again (so not only does it waste time, it might not even find the same instance). In some cases, this

[PATCH v5 1/4] provide an initializer for "struct object_info"

2016-08-11 Thread Jeff King
An all-zero initializer is fine for this struct, but because the first element is a pointer, call sites need to know to use "NULL" instead of "0". Otherwise some static checkers like "sparse" will complain; see d099b71 (Fix some sparse warnings, 2013-07-18) for example. So let's provide an

[PATCH v5] pack-objects mru

2016-08-11 Thread Jeff King
On Thu, Aug 11, 2016 at 02:57:51AM -0400, Jeff King wrote: > > One thing to be careful of is that there are more things this > > drop_reused_delta() should be doing. But I looked through the rest of > > check_object() and could not find anything else. > > Argh, I spoke too soon. > > It is true

Re: [PATCH v11 28/40] builtin/apply: rename option parsing functions

2016-08-11 Thread stefan.naewe
Am 11.08.2016 um 10:52 schrieb Christian Couder: > As these functions are going to be part of the libified > apply api, let's give them a name that is more specific s/api/API/ ;-) > to the apply API. > > Signed-off-by: Christian Couder > --- > builtin/apply.c | 40

Re: [PATCH v10 01/40] apply: make some names more specific

2016-08-11 Thread stefan.naewe
Am 11.08.2016 um 10:40 schrieb Christian Couder: > On Tue, Aug 9, 2016 at 4:51 PM, wrote: >> Am 08.08.2016 um 23:02 schrieb Christian Couder: >>> To prepare for some structs and constants being moved from >>> builtin/apply.c to apply.h, we should give them some

Re: [PATCH v10 01/40] apply: make some names more specific

2016-08-11 Thread Christian Couder
On Tue, Aug 9, 2016 at 4:51 PM, wrote: > Am 08.08.2016 um 23:02 schrieb Christian Couder: >> To prepare for some structs and constants being moved from >> builtin/apply.c to apply.h, we should give them some more >> specific names to avoid possible name

  1   2   >