Re: [PATCH v1 0/3] Update eol documentation

On Thu, Aug 25, 2016 at 1:31 PM, Junio C Hamano wrote: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> >> Sorry for posting this so late: >> While reviewing another patch I realized that the eol related >> documentation was not updated as it should

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

On Thu, Aug 25, 2016 at 3:31 PM, Junio C Hamano wrote: > What is wrong about that? 4*80k = 320kB overhead for length fields > to transfer 5GB worth of data? I do not think it is worth worrying > about it. > > But I am more surprised by seeing that "why not a single huge >

Re: on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

On 08/25/2016 06:01 PM, Alex Nauda wrote: > On Thu, Aug 25, 2016 at 2:28 AM, Michael Haggerty > wrote: >> On 08/24/2016 11:39 PM, Jeff King wrote: >>> On Wed, Aug 24, 2016 at 04:52:33PM -0400, Alex Nauda wrote: >>> Elastic File System (EFS) is Amazon's scalable

[PATCH v11 0/8] submodule inline diff format

From: Jacob Keller Modify the changes to do_submodule_path so that we properly call gitmodules_config() before the lookup of submodule_from_path. This may need to be modified so that we only call it the first time as I'm not sure what sort of performance hit we'll see.

[PATCH v11 1/8] cache: add empty_tree_oid object and helper function

From: Jacob Keller Similar to is_null_oid(), and is_empty_blob_sha1() add an empty_tree_oid along with helper function is_empty_tree_oid(). For completeness, also add an "is_empty_tree_sha1()", "is_empty_blob_sha1()", "is_empty_tree_oid()" and "is_empty_blob_oid()"

[PATCH v11 8/8] diff: teach diff to display submodule difference with an inline diff

From: Jacob Keller Teach git-diff and friends a new format for displaying the difference of a submodule. The new format is an inline diff of the contents of the submodule between the commit range of the update. This allows the user to see the actual code change caused by

[PATCH v11 7/8] submodule: refactor show_submodule_summary with helper function

From: Jacob Keller A future patch is going to add a new submodule diff format which displays an inline diff of the submodule changes. To make this easier, and to ensure that both submodule diff formats use the same initial header, factor out show_submodule_header()

[PATCH v11 6/8] submodule: convert show_submodule_summary to use struct object_id *

From: Jacob Keller Since we're going to be changing this function in a future patch, lets go ahead and convert this to use object_id now. Signed-off-by: Jacob Keller --- diff.c | 2 +- submodule.c | 16 submodule.h | 2 +-

[PATCH v11 3/8] graph: add support for --line-prefix on all graph-aware output

From: Jacob Keller Add an extension to git-diff and git-log (and any other graph-aware displayable output) such that "--line-prefix=" will print the additional line-prefix on every line of output. To make this work, we have to fix a few bugs in the graph API that force

[PATCH v11 4/8] diff: prepare for additional submodule formats

From: Jacob Keller A future patch will add a new format for displaying the difference of a submodule. Make it easier by changing how we store the current selected format. Replace the DIFF_OPT flag with an enumeration, as each format will be mutually exclusive.

[PATCH v11 5/8] allow do_submodule_path to work even if submodule isn't checked out

From: Jacob Keller Currently, do_submodule_path will attempt locating the .git directory by using read_gitfile on /.git. If this fails it just assumes the /.git is actually a git directory. This is good because it allows for handling submodules which were cloned in a

[PATCH v11 2/8] diff.c: remove output_prefix_length field

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: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

> On 25 Aug 2016, at 20:46, Stefan Beller wrote: > >> On Thu, Aug 25, 2016 at 4:07 AM, wrote: >> From: Lars Schneider >> >> packet_write_stream_with_flush_from_fd() and >> packet_write_stream_with_flush_from_buf() write

Re: [PATCH 06/15] sequencer: lib'ify read_populate_todo()

Johannes Schindelin writes: > To be truly useful, the sequencer should never die() but always return > an error. > > Signed-off-by: Johannes Schindelin > --- > sequencer.c | 14 +- > 1 file changed, 9 insertions(+), 5

Re: [PATCH 04/15] sequencer: lib'ify prepare_revs()

Johannes Schindelin writes: > To be truly useful, the sequencer should never die() but always return > an error. > > Signed-off-by: Johannes Schindelin > --- I am still looking at sequencer.c in 'master', but I do not think that the sole

Re: [PATCH 05/15] sequencer: lib'ify read_and_refresh_cache()

Johannes Schindelin writes: > To be truly useful, the sequencer should never die() but always return > an error. > > Signed-off-by: Johannes Schindelin > --- > sequencer.c | 15 ++- > 1 file changed, 10 insertions(+), 5

Re: [PATCH v10 0/9] submodule inline diff format

On Thu, Aug 25, 2016 at 3:38 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> So we should support the gitlink to a repository stored at >> without stuff inside the .git/modules, and we should support submodule >> gitlinks with a proper

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

larsxschnei...@gmail.com writes: > From: Lars Schneider > > packet_write_stream_with_flush_from_fd() and > packet_write_stream_with_flush_from_buf() write a stream of packets. All > content packets use the maximal packet size except for the last one. > After the last

Re: [PATCH v10 0/9] submodule inline diff format

Jacob Keller writes: > So we should support the gitlink to a repository stored at > without stuff inside the .git/modules, and we should support submodule > gitlinks with a proper .gitmodules setup. I don't think we should > die() but we should error properly so I will

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

Stefan Beller writes: > So the API provided by these read/write functions is intended > to move a huge chunks of data. And as it puts the data on the wire one > packet after the other without the possibility to intervene and e.g. send > a side channel progress bar update, I

Re: [PATCH v10 0/9] submodule inline diff format

On Thu, Aug 25, 2016 at 1:46 PM, Stefan Beller wrote: > On Thu, Aug 25, 2016 at 1:39 PM, Jacob Keller wrote: >> On Tue, Aug 23, 2016 at 10:47 AM, Stefan Beller wrote: >>> On Tue, Aug 23, 2016 at 10:25 AM, Junio C Hamano

Re: [PATCH v6 05/13] pkt-line: add packet_write_gently()

larsxschnei...@gmail.com writes: > From: Lars Schneider > > packet_write_fmt() has two shortcomings. First, it uses format_packet() > which lets the caller only send string data via "%s". That means it > cannot be used for arbitrary data that may contain NULs. Second,

Re: [PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()

larsxschnei...@gmail.com writes: > From: Lars Schneider > > packet_write_fmt() would die in case of a write error even though for > some callers an error would be acceptable. Add packet_write_fmt_gently() > which writes a formatted pkt-line and returns `0` for success

Re: Feature Request: Branch-Aware Submodules

Stefan Beller writes: >>> So you roughly do >>> >>> git checkout -b new-topic >>> # change the submodule to point at the latest upstream version: >>> git submodule update --remote >>> git commit -a -m "update submodule" >>> git checkout master >>> git

Re: [PATCH 03/15] sequencer: lib'ify do_pick_commit()

Johannes Schindelin writes: > To be truly useful, the sequencer should never die() but always return > an error. > > Signed-off-by: Johannes Schindelin > --- Instead of dying there, you let the caller high up in the callchain to notice

Re: Feature Request: Branch-Aware Submodules

On Thu, Aug 25, 2016 at 1:50 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> +cc Jacob and Lars who work with submodules as well. >> >> On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander >> wrote: >>> >>> Right now updating

Re: Feature Request: Branch-Aware Submodules

Stefan Beller writes: > +cc Jacob and Lars who work with submodules as well. > > On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander > wrote: >> >> Right now updating a submodule in a topic branch and merging it into master >> will not change the

Re: [PATCH v1 2/2] gitattributes: Document the unified "auto" handling

tbo...@web.de writes: > +If you want to ensure that text files that any contributor introduces to > +the repository have their line endings normalized, you could set the > +`text` attribute to "auto" for _all_ files. > + > + > +*text=auto > + >

Re: [PATCH v10 0/9] submodule inline diff format

On Thu, Aug 25, 2016 at 1:39 PM, Jacob Keller wrote: > On Tue, Aug 23, 2016 at 10:47 AM, Stefan Beller wrote: >> On Tue, Aug 23, 2016 at 10:25 AM, Junio C Hamano wrote: >>> I am not so sure about that. If there is an existing place

Re: [PATCH v1 1/2] git ls-files: text=auto eol=lf is supported in Git 2.10

tbo...@web.de writes: > From: Torsten Bögershausen > > The man page for `git ls-files --eol` mentions the combination > of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not > supported yet, but may be in the future. > Now they are supported Thanks. I'll finish the

Re: [PATCH v10 0/9] submodule inline diff format

On Tue, Aug 23, 2016 at 10:47 AM, Stefan Beller wrote: > On Tue, Aug 23, 2016 at 10:25 AM, Junio C Hamano wrote: >> I am not so sure about that. If there is an existing place that is >> buggy, shouldn't we fix that, instead of spreading the same bug >>

Re: [PATCH v10 0/9] submodule inline diff format

On Tue, Aug 23, 2016 at 10:25 AM, Junio C Hamano wrote: > I am not so sure about that. If there is an existing place that is > buggy, shouldn't we fix that, instead of spreading the same bug > (assuming that it is a bug in the first place, which I do not have a > strong

Re: [PATCH v1 0/3] Update eol documentation

tbo...@web.de writes: > From: Torsten Bögershausen > > Sorry for posting this so late: > While reviewing another patch I realized that the eol related > documentation was not updated as it should be. > > Torsten Bögershausen (2): > git ls-files: text=auto eol=lf is supported in

Re: [PATCH v14 14/27] bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C

Pranit Bauva writes: > A lot of parts of bisect.c uses exit() and these signals are then > trapped in the `bisect_start` function. Since the shell script ceases > its existence it would be necessary to convert those exit() calls to > return statements so that errors can

Re: [PATCH v6 10/13] convert: generate large test files only once

> On 25 Aug 2016, at 21:17, Stefan Beller wrote: > >> On Thu, Aug 25, 2016 at 4:07 AM, wrote: >> From: Lars Schneider >> >> Generate more interesting large test files > > How are the large test files more interesting?

Re: [PATCH v14 13/27] bisect--helper: `bisect_start` shell function partially in C

Junio C Hamano writes: >> +for (i = 0; i < revs.nr; i++) { >> +if (bad_seen) >> +string_list_append(, terms->term_good.buf); >> +else { >> +bad_seen = 1; >> +string_list_append(,

Re: [PATCH v6 07/13] pack-protocol: fix maximum pkt-line size

> On 25 Aug 2016, at 20:59, Stefan Beller wrote: > >> On Thu, Aug 25, 2016 at 4:07 AM, wrote: >> From: Lars Schneider >> >> According to LARGE_PACKET_MAX in pkt-line.h the maximal length of a >> pkt-line packet is 65520

Re: [PATCH v6 10/13] convert: generate large test files only once

On Thu, Aug 25, 2016 at 4:07 AM, wrote: > From: Lars Schneider > > Generate more interesting large test files How are the large test files more interesting? (interesting in the notion of covering more potential bugs? easier to debug? better

Re: [PATCH v14 13/27] bisect--helper: `bisect_start` shell function partially in C

Pranit Bauva writes: > +static int bisect_start(struct bisect_terms *terms, int no_checkout, > + const char **argv, int argc) > +{ > + int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0; > + int flags, pathspec_pos; > + struct

Re: [PATCH v6 07/13] pack-protocol: fix maximum pkt-line size

On Thu, Aug 25, 2016 at 4:07 AM, wrote: > From: Lars Schneider > > According to LARGE_PACKET_MAX in pkt-line.h the maximal length of a > pkt-line packet is 65520 bytes. The pkt-line header takes 4 bytes and > therefore the pkt-line data

Re: git push origin BRANCHNAME question

On Thu, Aug 25, 2016 at 10:50:23AM -0700, Junio C Hamano wrote: > Ed Greenberg writes: > > > I think I understand this from the git-push man page, but I want to > > make sure: > > > > I have two branches, master and develop. > > > > If I am (accidentally) sitting on master,

Re: [PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()

On 25 Aug 2016, at 20:12, Stefan Beller wrote: >> +int packet_write_fmt_gently(int fd, const char *fmt, ...) >> +{ >> + static struct strbuf buf = STRBUF_INIT; >> + va_list args; >> + >> + strbuf_reset(); >> + va_start(args, fmt); >> +

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

On Thu, Aug 25, 2016 at 4:07 AM, wrote: > From: Lars Schneider > > packet_write_stream_with_flush_from_fd() and > packet_write_stream_with_flush_from_buf() write a stream of packets. All > content packets use the maximal packet size except for

RE: Smart HTTP push permissions failure

Thank you for your reply Jeff. I have moved on to installing GitLab. It has been a success so far. Thanks, Dave -Original Message- From: Jeff King [mailto:p...@peff.net] Sent: Wednesday, August 24, 2016 1:00 PM To: David McGough Cc: git@vger.kernel.org

Re: [PATCH v14 12/27] bisect--helper: `get_terms` & `bisect_terms` shell function in C

Pranit Bauva writes: > +static int bisect_terms(struct bisect_terms *terms, const char **argv, int > argc) > +{ > + int i; > + > + if (get_terms(terms)) { > + fprintf(stderr, _("no terms defined\n")); > + return -1; > + } > + if

Re: [PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()

> +int packet_write_fmt_gently(int fd, const char *fmt, ...) > +{ > + static struct strbuf buf = STRBUF_INIT; > + va_list args; > + > + strbuf_reset(); > + va_start(args, fmt); > + format_packet(, fmt, args); format_packet also takes care of tracing the contents,

Re: git push origin BRANCHNAME question

Ed Greenberg writes: > I think I understand this from the git-push man page, but I want to > make sure: > > I have two branches, master and develop. > > If I am (accidentally) sitting on master, and issue 'git push origin > develop', does this properly push develop to remote

Re: Feature Request: Branch-Aware Submodules

"Hedges Alexander" writes: > Right now updating a submodule in a topic branch and merging it into master > will not change the submodule index in master leading to at least two commit > for the same change (one in any active branch). I stopped reading here because I am

Re: Feature Request: Branch-Aware Submodules

+cc Jacob and Lars who work with submodules as well. On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander wrote: > > Right now updating a submodule in a topic branch and merging it into master > will not change the submodule index in master leading to at least two commit >

Re: [PATCH] checkout: swap the order of ambiguity check for :/ syntax

Duy Nguyen writes: > On Wed, Aug 24, 2016 at 11:35 PM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> It's not wonderful, but it's in line with how git-checkout stops caring >>> about ambiguity after the first argument can

Re: on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

On Thu, Aug 25, 2016 at 2:28 AM, Michael Haggerty wrote: > On 08/24/2016 11:39 PM, Jeff King wrote: >> On Wed, Aug 24, 2016 at 04:52:33PM -0400, Alex Nauda wrote: >> >>> Elastic File System (EFS) is Amazon's scalable filesystem product that >>> is exposed to the OS as an NFS

[PATCH v1 0/3] Update eol documentation

From: Torsten Bögershausen Sorry for posting this so late: While reviewing another patch I realized that the eol related documentation was not updated as it should be. Torsten Bögershausen (2): git ls-files: text=auto eol=lf is supported in Git 2.10 gitattributes: Document

[PATCH v1 1/2] git ls-files: text=auto eol=lf is supported in Git 2.10

From: Torsten Bögershausen The man page for `git ls-files --eol` mentions the combination of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not supported yet, but may be in the future. Now they are supported Signed-off-by: Torsten Bögershausen ---

[PATCH v1 2/2] gitattributes: Document the unified "auto" handling

From: Torsten Bögershausen Update the documentation about text=auto: text=auto now follows the core.autocrlf handling when files are not normalized in the repository. For a cross platform project recommend the usage of attributes for line-ending conversions. Signed-off-by:

[PATCH 6/6] wt-status: teach has_{unstaged,uncommitted}_changes() about submodules

Sometimes we are *actually* interested in those changes... For example when an interactive rebase wants to continue with a staged submodule update. Signed-off-by: Johannes Schindelin --- builtin/pull.c | 2 +- wt-status.c| 16 +--- wt-status.h|

[PATCH 5/6] Export also the has_un{staged,committed}_changed() functions

They will be used in the upcoming rebase helper. Signed-off-by: Johannes Schindelin --- wt-status.c | 4 ++-- wt-status.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wt-status.c b/wt-status.c index 33dd76f..1c3fabf 100644 --- a/wt-status.c

[PATCH 4/6] require_clean_work_tree: ensure that the index was read

The function would otherwise pretend to work fine, but totally ignore the working directory. Signed-off-by: Johannes Schindelin --- wt-status.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/wt-status.c b/wt-status.c index 792dda9..33dd76f 100644 ---

Re: [RFC] Proposed questions for "Git User's Survey 2016"

W dniu 22.08.2016 o 01:59, Andrew Ardill pisze: > On 21 August 2016 at 04:56, Jakub Narębski wrote: >> 25. What [channel(s)] do you use to request/get help about Git [(if any)] > > It may also be useful to ask how people hear news about git, such as > when a new release comes

[PATCH 0/6] Pull out require_clean_work_tree() functionality from builtin/pull.c

This is the 5th last patch series of my work to accelerate interactive rebases in particular on Windows. Basically, all it does is to make reusable some functions that were ported over from git-pull.sh but made private to builtin/pull.c. An earlier attempt included only the first patch, and

[PATCH 3/6] Make the require_clean_work_tree() function truly reusable

It is remarkable that libgit.a did not sport this function yet... Let's move it into a more prominent (and into an actually reusable) spot: wt-status.[ch]. Signed-off-by: Johannes Schindelin --- builtin/pull.c | 75

[PATCH 2/6] pull: make code more similar to the shell script again

When converting the pull command to a builtin, the require_clean_work_tree() function was renamed and the pull-specific parts hard-coded. This makes it impossible to reuse the code, so let's modify the code to make it more similar to the original shell script again. Signed-off-by: Johannes

[PATCH 1/6] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

In cmd_pull(), when verifying that there are no changes preventing a rebasing pull, we diligently pass the prefix parameter to the die_on_unclean_work_tree() function which in turn diligently passes it to the has_unstaged_changes() and has_uncommitted_changes() functions. The casual reader might

[PATCH v6 07/13] pack-protocol: fix maximum pkt-line size

From: Lars Schneider According to LARGE_PACKET_MAX in pkt-line.h the maximal length of a pkt-line packet is 65520 bytes. The pkt-line header takes 4 bytes and therefore the pkt-line data component must not exceed 65516 bytes. Signed-off-by: Lars Schneider

[ANNOUNCE] Git for Windows 2.9.3(2)

Dear Git users, It is my pleasure to announce that Git for Windows 2.9.3(2) is available from: https://git-for-windows.github.io/ Changes since Git for Windows v2.9.3 (August 13th 2016) New Features • Comes with Git Credential Manager v1.6.1. • The feature introduced with Git for

Re: core.autocrlf, was Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Hi Torsten, On Thu, 25 Aug 2016, Torsten Bögershausen wrote: > > I was not talking about the cost of correcting mistakes. Running --filters > > is potentially very costly. Just so you understand what I am talking > > about: I have a report that says that checking out a sizeable worktree > > with

Re: Working with public-inbox.org [Was: [PATCH] rev-parse: respect core.hooksPath in --git-path]

Hi Kuba, On Mon, 22 Aug 2016, Jakub Narębski wrote: > W dniu 22.08.2016 o 15:18, Johannes Schindelin pisze: > > > So unfortunately this thread has devolved. Which is sad. Because all I > > wanted is to have a change in Git's submission process that would not > > exclude *so many* developers.

git push origin BRANCHNAME question

I think I understand this from the git-push man page, but I want to make sure: I have two branches, master and develop. If I am (accidentally) sitting on master, and issue 'git push origin develop', does this properly push develop to remote develop, or does it push master to remote develop

git push origin BRANCHNAME question

I think I understand this from the git-push man page, but I want to make sure: I have two branches, master and develop. If I am (accidentally) sitting on master, and issue 'git push origin develop', does this properly push develop to remote develop, or does it push master to remote develop

Re: Working with public-inbox.org [Was: [PATCH] rev-parse: respect core.hooksPath in --git-path]

Hi Eric, On Wed, 24 Aug 2016, Eric Wong wrote: > Johannes Schindelin wrote: > > > Now, with somebody like me who would lose a lot when destroying trust, > > it is highly unlikely. But it is possible that in between the hundreds > > of sincere contributors a bad

Re: Working with public-inbox.org [Was: [PATCH] rev-parse: respect core.hooksPath in --git-path]

Hi Arif, On Thu, 25 Aug 2016, Arif Khokar wrote: > On 08/24/2016 09:04 AM, Johannes Schindelin wrote: > > > > On Mon, 22 Aug 2016, Philip Oakley wrote: > > >> I do note that dscho's patches now have the extra footer (below the > >> three dashes) e.g. > >> > >> Published-As:

Re: Working with public-inbox.org [Was: [PATCH] rev-parse: respect core.hooksPath in --git-path]

Hi Eric, On Mon, 22 Aug 2016, Eric Wong wrote: > Johannes Schindelin wrote: > > > I just want developers who are already familiar with Git, and come up with > > an improvement to Git itself, to be able to contribute it without having > > to pull out their hair in

[PATCH v6 04/13] pkt-line: add packet_flush_gently()

From: Lars Schneider packet_flush() would die in case of a write error even though for some callers an error would be acceptable. Add packet_flush_gently() which writes a pkt-line flush packet and returns `0` for success and `-1` for failure. Signed-off-by: Lars

Re: core.autocrlf, was Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

I was not talking about the cost of correcting mistakes. Running --filters is potentially very costly. Just so you understand what I am talking about: I have a report that says that checking out a sizeable worktree with core.autocrlf=true is 58% slower than with core.autocrlf=false. That is

[PATCH v6 08/13] convert: quote filter names in error messages

From: Lars Schneider Git filter driver commands with spaces (e.g. `filter.sh foo`) are hard to read in error messages. Quote them to improve the readability. Signed-off-by: Lars Schneider --- convert.c | 12 ++-- 1 file changed, 6

[PATCH v6 09/13] convert: modernize tests

From: Lars Schneider Use `test_config` to set the config, check that files are empty with `test_must_be_empty`, compare files with `test_cmp`, and remove spaces after ">" and "<". Signed-off-by: Lars Schneider --- t/t0021-conversion.sh | 62

[PATCH v6 00/13] Git filter protocol

From: Lars Schneider The goal of this series is to avoid launching a new clean/smudge filter process for each file that is filtered. A short summary about v1 to v5 can be found here: https://git.github.io/rev_news/2016/08/17/edition-18/ This series is also published

Re: core.autocrlf, was Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Hi Junio, On Wed, 24 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> In any case, in the ideal future, I would imagine that we would want > >> to have "cat-file blob" to enable "--filters" by default; that would > >> make cat-file and

Re: Git for Windows documentation, was Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Hi Dakota, On Wed, 24 Aug 2016, Dakota Hawkins wrote: > On Wed, Aug 24, 2016 at 11:41 AM, Johannes Schindelin > wrote: > > > > On Tue, 23 Aug 2016, Dakota Hawkins wrote: > > > >> I use GFW almost exclusively, but I pretty much always consult the > >> upstream

[PATCH v6 05/13] pkt-line: add packet_write_gently()

From: Lars Schneider packet_write_fmt() has two shortcomings. First, it uses format_packet() which lets the caller only send string data via "%s". That means it cannot be used for arbitrary data that may contain NULs. Second, it will always die on error. Add

[PATCH v6 13/13] read-cache: make sure file handles are not inherited by child processes

From: Lars Schneider Consider the case of a file that requires filtering and is present in branch A but not in branch B. If A is the current HEAD and we checkout B then the following happens: 1. ce_compare_data() opens the file 2. index_fd() detects that the file

[PATCH v6 02/13] pkt-line: extract set_packet_header()

From: Lars Schneider set_packet_header() converts an integer to a 4 byte hex string. Make this function locally available so that other pkt-line functions can use it. Signed-off-by: Lars Schneider --- pkt-line.c | 19 +-- 1

[PATCH v6 12/13] convert: add filter..process option

From: Lars Schneider Git's clean/smudge mechanism invokes an external filter process for every single blob that is affected by a filter. If Git filters a lot of blobs then the startup time of the external filter processes can become a significant part of the overall Git

[PATCH v6 01/13] pkt-line: rename packet_write() to packet_write_fmt()

From: Lars Schneider packet_write() should be called packet_write_fmt() as the string parameter can be formatted. Suggested-by: Junio C Hamano Signed-off-by: Lars Schneider --- builtin/archive.c| 4 ++--

[PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()

From: Lars Schneider packet_write_fmt() would die in case of a write error even though for some callers an error would be acceptable. Add packet_write_fmt_gently() which writes a formatted pkt-line and returns `0` for success and `-1` for an error. Signed-off-by: Lars

[PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

From: Lars Schneider packet_write_stream_with_flush_from_fd() and packet_write_stream_with_flush_from_buf() write a stream of packets. All content packets use the maximal packet size except for the last one. After the last content packet a `flush` control packet is

[PATCH v6 11/13] convert: make apply_filter() adhere to standard Git error handling

From: Lars Schneider apply_filter() returns a boolean that tells the caller if it "did convert or did not convert". The variable `ret` was used throughout the function to track errors whereas `1` denoted success and `0` failure. This is unusual for the Git source where

[PATCH v6 10/13] convert: generate large test files only once

From: Lars Schneider Generate more interesting large test files with pseudo random characters in between and reuse these test files in multiple tests. Run tests formerly marked as EXPENSIVE every time but with a smaller data set. Signed-off-by: Lars Schneider

Re: [RFC] Proposed questions for "Git User's Survey 2016"

W dniu 20.08.2016 o 23:29, Eric Wong pisze: > Jakub Narębski wrote: >> Other version control systems >> >> 20. What other version control systems (SCM) do you use beside Git? >>(multiple choice, with other) >> >> Explanation: "using" version control system here means

Re: [PATCH] checkout: swap the order of ambiguity check for :/ syntax

On Wed, Aug 24, 2016 at 11:35 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> It's not wonderful, but it's in line with how git-checkout stops caring >> about ambiguity after the first argument can be resolved as a ref >> (there's even a test

Feature Request: Branch-Aware Submodules

Dear Git Developers, First of all, thanks for this great project, it has made my life a lot easier as a developer! I'm writing this email to suggest some improvements to git submodules. In my eyes how git handles submodules could be improved to be more intuitive to a novice and require less

Re: [PATCH v2] for-each-ref: add %(upstream:gone) to mark missing refs

On 25 August 2016 at 07:56, Karthik Nayak wrote: > > I'm thinking more on the lines of `%(upstream)` being an atom and the > `:track` being an option under that atom. I like sub-atom though ;) > On second thought maybe "quark" is better :P > On Thu, Aug 25, 2016 at 12:03

Re: on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

On 08/24/2016 11:39 PM, Jeff King wrote: > On Wed, Aug 24, 2016 at 04:52:33PM -0400, Alex Nauda wrote: > >> Elastic File System (EFS) is Amazon's scalable filesystem product that >> is exposed to the OS as an NFS mount. We're using EFS to host the >> filesystem used by a Jenkins CI server.