Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

Hi Stephen, On Wed, 17 Aug 2016, Stephen Morton wrote: > > multiple_commits = (todo_list->next) != NULL; > > Why not "last_commit" instead of "multiple_commits"? > > Because it *isn't*. Personally, I do prefer to have the simpler instruction if the commit happens to be the last one

Re: Working from different machines.

* First, `--mirror` might be what the relation between 'desktop' and 'home' repositories should be. Here's what I'm trying, am I in the right ballpark? desk> git branch * master desk> git checkout -b banana Switched to a new branch 'banana' desk> echo 'message' > oracle desk> git add

git format-patch --break-rewrites broken in 2.9.3

This command used to create a diff which can be consumed by patch. But at least with 2.9.3 it just gives a rename output: git format-patch \ --no-signature \ --stdout \ --break-rewrites \ --keep-subject \

Re: Working from different machines.

On 08/17/2016 03:41 PM, Junio C Hamano wrote: Tobiah writes: In other words, I want to work from different machines, and always sit down to the environment exactly as I last left it. You have several options, but it depends on untold expectations you have beyond "exactly as

Re: [PATCH 3/3] receive-pack: allow a maximum input size to be specified

On Tue, Aug 16, 2016 at 6:21 PM, Jeff King wrote: >> > >> > Is there any reason to use different filenames and sizes for the two >> > runs? They should behave identically, so it would make more sense to me >> > to subject them to identical inputs. >> >> About the sizes, I thought

Re: [PATCH v5 15/15] read-cache: make sure file handles are not inherited by child processes

Hi Lars, On Wed, 10 Aug 2016, larsxschnei...@gmail.com wrote: > 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: > >

Re: [PATCH 1/2 v5] pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use

On Tue, Aug 09, 2016 at 10:31:43PM +0300, Kirill Smelkov wrote: > Since 6b8fda2d (pack-objects: use bitmaps when packing objects) there > are two codepaths in pack-objects: with & without using bitmap > reachability index. Sorry, I got distracted from reviewing these patches. I'll give them a

Re: git format-patch --break-rewrites broken in 2.9.3

Junio C Hamano writes: > I think that is one half of the story. > > The other half is a long/well known bug that lets "diff -B -M" to > produce incorrect/broken patch that cannot be applied. It was > documented in the thread that begins at: > >

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Thu, Aug 18, 2016 at 1:39 PM, Stefan Beller wrote: > On Thu, Aug 18, 2016 at 1:24 PM, Jacob Keller wrote: >> On Thu, Aug 18, 2016 at 12:04 PM, Stefan Beller wrote: >>> On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller

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

Eric Wong writes: > I see a choice of mail client as no different than a choice of > text editor. Neither my mail client or text editor is heavily > customized. The key feature I rely on from both tools is piping > data to external commands. FWIW, that applies to me exactly,

Re: [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output

From: Jacob Keller On Thu, Aug 18, 2016 at 10:56 AM, Stefan Beller wrote: > On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller > wrote: >> From: Jacob Keller >> - /* >> -

Re: git format-patch --break-rewrites broken in 2.9.3

Olaf Hering writes: > On Thu, Aug 18, Jeff King wrote: > >> Olaf, what version of patch are you using? > > Mostly 2.7.x, but also add 2.5.x to the mix. > So far I did not try what the tools dealing with the resulting patch > file would actually do with such a stripped down

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

Johannes Schindelin wrote: > +++ b/compat/mingw.h > @@ -67,6 +67,10 @@ typedef int pid_t; > #define F_SETFD 2 > #define FD_CLOEXEC 0x1 > > +#if !defined O_CLOEXEC && defined O_NOINHERIT > +#define O_CLOEXECO_NOINHERIT > +#endif > +++ b/tempfile.c > @@ -120,7

[PATCH 0/2] help: make option --help open man pages only for Git commands

In this version, one patch has been turned into two. The first introduces the option "command-only" to make 'help' only working for commands and additionally give some nice help on typos. The second makes option --help only work for actual Git commands. Ralf Thielow (2): help: introduce

Re: git format-patch --break-rewrites broken in 2.9.3

On Thu, Aug 18, Jeff King wrote: > Olaf, what version of patch are you using? Mostly 2.7.x, but also add 2.5.x to the mix. So far I did not try what the tools dealing with the resulting patch file would actually do with such a stripped down variant. Olaf signature.asc Description: PGP

What's cooking in git.git (Aug 2016, #07; Thu, 18)

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 preview for the upcoming 2.10

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

Eric Wong writes: > O_CLOEXEC only exists since Linux 2.6.23 and there are likely > still LTS (CentOS 5.x?) and non-Linux systems which do not have > it, as well as machines with could have it defined in userspace > headers but not have it in the kernel. > > So I suggest

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

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

[PATCH 1/2] help: introduce option --command-only

Introduce option --command-only to the help command. With this option being passed, "git help" will open man pages only for commands. Since we know it is a command, we can use function help_unknown_command to give the user advice on typos. Signed-off-by: Ralf Thielow

Re: [PATCH 2/2] help: make option --help open man pages only for Git commands

Ralf Thielow writes: > If option --help is passed to a Git command, we try to open > the man page of that command. However, we do it even for commands > we don't know. Make sure it is a Git command. What the patch does is correct, I think, but the explanation may

Re: [PATCH v7 4/7] submodule: allow do_submodule_path to work if given gitdir directly

On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller wrote: > From: Jacob Keller > > Currently, do_submodule_path relies on read_gitfile, which will die() if > it can't read from the specified gitfile. Unfortunately, this means that > do_submodule_path

Re: [PATCH v2 3/3] receive-pack: allow a maximum input size to be specified

Christian Couder writes: > From: Jeff King > > Receive-pack feeds its input to either index-pack or > unpack-objects, which will happily accept as many bytes as > a sender is willing to provide. Let's allow an arbitrary > cutoff point where we will

Re: [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output

On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller wrote: > 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

Re: [PATCH 2/4] cat-file: introduce the --filters option

On Thu, Aug 18, 2016 at 02:46:17PM +0200, Johannes Schindelin wrote: > As suggested by its name, the --filters option applies the filters [] > diff --git a/t/t8010-cat-file-filters.sh b/t/t8010-cat-file-filters.sh Does it make sense to integrate tests into t1006-cat-file ? > new file mode 100755

Re: git format-patch --break-rewrites broken in 2.9.3

On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: > This command used to create a diff which can be consumed by patch. But > at least with 2.9.3 it just gives a rename output: > > git format-patch \ > --no-signature \ > --stdout \ > --break-rewrites \ >

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

Jacob Keller writes: If we were to change those, we could discuss if we want to go with full sentences all the time: submodule is new submodule is deleted submodule is not initialized >>> >>> I agree, I'll make a new patch

Re: Working with zip files

On Thu, 18 Aug 2016, Jakub Narębski wrote: JN>> You can find rezip clean/smudge filter (originally intended for JN>> OpenDocument Format (ODF), that is OpenOffice.org etc.) that stores JN>> zip or zip-archive (like ODT, jar, etc.) uncompressed. I think JN>> you can find it on GitWiki, but I

Re: [PATCH v2 3/3] receive-pack: allow a maximum input size to be specified

On Thu, Aug 18, 2016 at 01:25:43PM -0700, Junio C Hamano wrote: > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > index 0bcb679..f5b6061 100644 > > --- a/Documentation/config.txt > > +++ b/Documentation/config.txt > > @@ -2517,6 +2517,11 @@ receive.unpackLimit:: > >

Re: [PATCH v7 4/7] submodule: allow do_submodule_path to work if given gitdir directly

Jacob Keller writes: > From: Jacob Keller > > Currently, do_submodule_path relies on read_gitfile, which will die() if > it can't read from the specified gitfile. Unfortunately, this means that > do_submodule_path will not work when given the

Re: [PATCH 2/4] cat-file: introduce the --filters option

Johannes Schindelin writes: > As suggested by its name, the --filters option applies the filters > that are currently configured for the specified path. > > This feature comes in handy when a 3rd-party tool wants to work with > the contents of files from past

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Thu, Aug 18, 2016 at 1:49 PM, Junio C Hamano wrote: > Jacob Keller writes: > > If we were to change those, we could discuss if we want to go with > full sentences > all the time: > > submodule is new > submodule is

Re: [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output

On Thu, Aug 18, 2016 at 10:56 AM, Stefan Beller wrote: > On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller > wrote: >> - if (!graph) >> + if (!graph) { >> + graph_show_line_prefix(default_diffopt); >> return; >> + } > >> - if

Re: [PATCH v7 7/7] diff: teach diff to display submodule difference with an inline diff

On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller wrote: > if (o->submodule_format == DIFF_SUBMODULE_LOG && > (!one->mode || S_ISGITLINK(one->mode)) && > (!two->mode || S_ISGITLINK(two->mode))) { > @@ -2311,6 +2322,17 @@ static void

Re: [PATCH 4/4] cat-file: support --textconv/--filters in batch mode

Johannes Schindelin writes: > With this patch, --batch can be combined with --textconv or --filters. > For this to work, the input needs to have the form > > > > so that the filters can be chosen appropriately. > --batch:: > --batch=:: > Print object

Re: [PATCH 1/4] cat-file: fix a grammo in the man page

Johannes Schindelin writes: > "... has be ..." -> "... has to be ..." > > Signed-off-by: Johannes Schindelin > --- > Documentation/git-cat-file.txt | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller wrote: > 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

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Thu, Aug 18, 2016 at 12:04 PM, Stefan Beller wrote: > On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller > wrote: >> + if (is_null_sha1(one)) >> + message = "(new submodule)"; >> + else if (is_null_sha1(two)) >> +

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

Hi Junio, On Wed, 17 Aug 2016, Junio C Hamano wrote: > But it deserves mention in the lockfile and the tempfile API docs in > and that the file descriptor returned from > these public entry points does not survive across fork(2). I touched the comments up a little bit, and I also fixed the

Re: [PATCH v7 5/7] submodule: correct output of submodule log format

On Thu, Aug 18, 2016 at 11:25 AM, Stefan Beller wrote: > On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller > wrote: >> From: Jacob Keller >> >> The submodule log diff output incorrectly states that the submodule is >> "not

[PATCH v8 4/8] submodule: allow add_submodule_odb to work even if path is not checked out

From: Jacob Keller Currently, do_submodule_path will first try to locate the git directory using read_gitfile on /.git. If this fails, it goes ahead and assumes the path is actually the git directory. This is good as it allows submodules which aren't stored in the

Re: [PATCH 4/4] cat-file: support --textconv/--filters in batch mode

On Thu, Aug 18, 2016 at 02:46:28PM +0200, Johannes Schindelin wrote: > With this patch, --batch can be combined with --textconv or --filters. > For this to work, the input needs to have the form > > > > so that the filters can be chosen appropriately. The object name can have spaces in

[PATCH v8 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 v8 1/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

[PATCH v8 3/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.

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

On Wed, Aug 17, 2016 at 5:17 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> and now with error handling of invalid options. > > Thanks. Well this was not the end of the story. I sent that version out, before doing a final test run, because

[PATCH v8 5/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 +-

Re: [PATCH 4/4] cat-file: support --textconv/--filters in batch mode

On Thu, Aug 18, 2016 at 02:46:28PM +0200, Johannes Schindelin wrote: > With this patch, --batch can be combined with --textconv or --filters. > For this to work, the input needs to have the form > > > > so that the filters can be chosen appropriately. > > Signed-off-by: Johannes

Donation Funds

You are a recipient to Mrs Julie leach Donation of 2M USD. Contact (julie_leac...@hotmail.com) for claims -- 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

[PATCH v8 2/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 v8 6/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()

Re: [PATCH v7 7/7] diff: teach diff to display submodule difference with an inline diff

On Thu, Aug 18, 2016 at 12:47 PM, Stefan Beller wrote: > On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller > wrote: > > > >> if (o->submodule_format == DIFF_SUBMODULE_LOG && >> (!one->mode || S_ISGITLINK(one->mode)) && >>

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Thu, Aug 18, 2016 at 1:24 PM, Jacob Keller wrote: > On Thu, Aug 18, 2016 at 12:04 PM, Stefan Beller wrote: >> On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller >> wrote: >>> + if (is_null_sha1(one)) >>> +

Re: Working with zip files

On Thu, 18 Aug 2016, Jakub Narębski wrote: On 18 August 2016 at 18:56, David Lang wrote: On Thu, 18 Aug 2016, Jakub Narębski wrote: JN>> You can find rezip clean/smudge filter (originally intended for JN>> OpenDocument Format (ODF), that is OpenOffice.org etc.) that stores

Re: [PATCH v7 5/7] submodule: correct output of submodule log format

On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller wrote: > From: Jacob Keller > > The submodule log diff output incorrectly states that the submodule is > "not checked out" in cases where it wants to say the submodule is "not > initialized". Change

[PATCH v8 7/8] cache: add empty_tree_oid object

From: Jacob Keller Add an empty_tree_oid object which can be used in place of EMPTY_TREE_SHA1_BIN_LITERAL for code which is being converted to struct object_id. Signed-off-by: Jacob Keller --- cache.h | 2 ++ sha1_file.c | 3 +++ 2 files

[PATCH v2 0/2] Do not lock temporary files via child processes on Windows

This issue was originally reported and fixed in https://github.com/git-for-windows/git/pull/755 The problem is that file handles to temporary files (such as index.lock) were inherited by spawned processes. If those spawned processes do not exit before the parent process wants to delete or rename

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

Hi Eric, On Wed, 17 Aug 2016, Eric Sunshine wrote: > On Wed, Aug 17, 2016 at 8:41 AM, Johannes Schindelin > wrote: > > When the index is locked and child processes inherit the handle to > > said lock and the parent process wants to remove the lock before the > >

Re: [PATCH 1/2] help: introduce option --command-only

From: "Ralf Thielow" Introduce option --command-only to the help command. With this option being passed, "git help" will open man pages only for commands. Since we know it is a command, we can use function help_unknown_command to give the user advice on typos.

Re: git format-patch --break-rewrites broken in 2.9.3

On Thu, Aug 18, 2016 at 11:05:22AM -0400, Jeff King wrote: > On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: > > > This command used to create a diff which can be consumed by patch. But > > at least with 2.9.3 it just gives a rename output: > > > > git format-patch \ > >

Re: [PATCH 4/4] cat-file: support --textconv/--filters in batch mode

Jeff King writes: > On Thu, Aug 18, 2016 at 02:46:28PM +0200, Johannes Schindelin wrote: > >> With this patch, --batch can be combined with --textconv or --filters. >> For this to work, the input needs to have the form >> >> >> >> so that the filters can be chosen

Re: git format-patch --break-rewrites broken in 2.9.3

On Thu, Aug 18, 2016 at 05:16:55PM +0200, Matthieu Moy wrote: > Jeff King writes: > > > On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: > > > >> This command used to create a diff which can be consumed by patch. But > >> at least with 2.9.3 it just gives a rename

Re: [PATCH 2/2 v7] pack-objects: use reachability bitmap index when generating non-stdout pack

On Tue, Aug 09, 2016 at 10:32:17PM +0300, Kirill Smelkov wrote: > Subject: Re: [PATCH 2/2 v7] pack-objects: use reachability bitmap index when >generating non-stdout pack This is v7, but as I understand your numbering, it goes with v5 of patch 1/2 that I just reviewed (usually we just

Re: [PATCH v7 4/7] submodule: allow do_submodule_path to work if given gitdir directly

On Thu, Aug 18, 2016 at 11:46 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> From: Jacob Keller >> >> Currently, do_submodule_path relies on read_gitfile, which will die() if >> it can't read from the specified gitfile.

Re: Working from different machines.

W dniu 18.08.2016 o 16:28, Tobiah pisze: > ## [...] Why does it still mention 'flipper' and 'tart' and all > ## other branches I've played with. When I delte them locally, I want > ## them to be deleted everywhere. They just keep accumulating. In case of non-mirror setup. Git wouldn't delete

[PATCH v8 0/8] submodule show inline diff

From: Jacob Keller v8 has changes suggested by Junio and Stefan Beller, as well as a few modifications of my own, plus more tests. Series interdiff of v7 and v8: diff --git c/builtin/rev-list.c w/builtin/rev-list.c index 1a75a83538f4..21cde8dd6b31 100644 ---

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

Junio C Hamano wrote: > Our codepaths themselves generally do not care about O_CLOEXEC, so > giving a racy emulation of it is not worth the effort, making the > later half of the above an overkill. OK. > Perhaps the three lines to > define O_CLOEXEC to 0 on older UNIX might

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

Johannes Schindelin wrote: > BTW I take this thread as yet another proof that people are unhappy with > mail list-based review: if you have to build *that much* tooling around it > (and Peff & Junio certainly have a megaton of advanced and sophisticated > tooling

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Thu, Aug 18, 2016 at 12:00 AM, David Aguilar wrote: >> +void show_submodule_summary(FILE *f, const char *path, >> + const char *line_prefix, >> + unsigned char one[20], unsigned char two[20], >> + unsigned dirty_submodule, const char *meta,

Oxfam Aid Donation..

Congratulations! You e-mail has just won you the sum of $1,000,000.00 USD as a charity donations/aid from Oxfam International in conjunction with South African National Lotto. Contact us back as soon as possible for more details. -- To unsubscribe from this list: send the line "unsubscribe git"

Re: Working from different machines.

On Wed, Aug 17, 2016 at 3:41 PM, Junio C Hamano wrote: > If the answer is "yes", then you are in the problem space that > Git-the-tool is interested in solving. Assuming that you have > network connection into 'desktop' from 'home', the solution would > involve making it the

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Wed, Aug 17, 2016 at 05:51:30PM -0700, Jacob Keller wrote: > [snip] > @@ -333,31 +326,23 @@ static void print_submodule_summary(struct rev_info > *rev, FILE *f, > strbuf_release(); > } > > -void show_submodule_summary(FILE *f, const char *path, > +/* Helper function to display the

Re: [ANNOUNCE] Git for Windows 2.9.3

Hi Junio, On Wed, 17 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> And then your "git cat-file" patch can be upstreamed with the option > >> renamed to (or with an additional synonym) "--filters", which would make > >> things consistent. > > >

Re: Draft of Git Rev News edition 18

Philip Oakley wrote: > Would including a 'help' link on the main pages be possible? Maybe to the > www-design page or whatever, just to make the users aware of the wider > resourses, and a few key ways of entering search queries (such as the > "gmane:123456" which gets that

[PATCH 0/4] cat-file: optionally convert to worktree version

When third-party tools need to access to contents of blobs in the database, they might be more interested in the worktree version than in the "clean" version of said contents. This branch introduces the --filters option to make that happen, the --use-path option to provide the path separately if

[PATCH 1/4] cat-file: fix a grammo in the man page

"... has be ..." -> "... has to be ..." Signed-off-by: Johannes Schindelin --- Documentation/git-cat-file.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index

Re: Working with zip files

W dniu 16.08.2016 o 22:19, Junio C Hamano pisze: > Jakub Narębski writes: > >> There is also `textconv` filter that can be used instead; it might >> be 'unzip -c' (extract files to stdout, with filenames), or 'unzip -p' >> (same, without filenames). > > That assumes that the

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

Hi Stefan, On Tue, 16 Aug 2016, Stefan Beller wrote: > > BTW in light of the discussion we are having elsewhere I just need to > > point out that it was *dramatically* faster for me to edit run-command.c, > > find "hooks/" and adjust the code manually than it would have been to save > > the diff

Re: Working from different machines.

W dniu 18.08.2016 o 00:41, Junio C Hamano pisze: > Tobiah writes: > [...] the next question is if you commit all the > changes you made before you leave the 'desktop'. [...] > > If the answer is "yes", then you are in the problem space that > Git-the-tool is interested in

[PATCH 3/4] cat-file --textconv/--filters: allow specifying the path separately

There are circumstances when it is relatively easy to figure out the object name for a given path, but not the revision. For example, when looking at a diff generated by Git, the object names are recorded, but not the revision. As a matter of fact, the revisions from which the diff was generated

[PATCH 4/4] cat-file: support --textconv/--filters in batch mode

With this patch, --batch can be combined with --textconv or --filters. For this to work, the input needs to have the form so that the filters can be chosen appropriately. Signed-off-by: Johannes Schindelin --- Documentation/git-cat-file.txt | 18

[PATCH 2/4] cat-file: introduce the --filters option

As suggested by its name, the --filters option applies the filters that are currently configured for the specified path. This feature comes in handy when a 3rd-party tool wants to work with the contents of files from past revisions as if they had been checked out, but without detouring via

[PATCH v2 0/3] limit the size of the packs we receive

Goal In https://public-inbox.org/git/20150612182045.GA23698%40peff.net/, Peff sent a patch that is used by GitHub to abort `git receive-pack` when the size of the pack we receive is bigger than a configured limit. GitLab is interested in using the same approach and in standardizing the

[PATCH v2 3/3] receive-pack: allow a maximum input size to be specified

From: Jeff King Receive-pack feeds its input to either index-pack or unpack-objects, which will happily accept as many bytes as a sender is willing to provide. Let's allow an arbitrary cutoff point where we will stop writing bytes to disk. Cleaning up what has already been

[PATCH v2 2/3] unpack-objects: add --max-input-size= option

When receiving a pack-file, it can be useful to abort the `git unpack-objects`, if the pack-file is too big. Signed-off-by: Christian Couder --- Documentation/git-unpack-objects.txt | 3 +++ builtin/unpack-objects.c | 7 +++ 2 files changed, 10

[PATCH v2 1/3] index-pack: add --max-input-size= option

From: Jeff King When receiving a pack-file, it can be useful to abort the `git index-pack`, if the pack-file is too big. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- Documentation/git-index-pack.txt | 2 ++

Re: [PATCH v2 0/3] limit the size of the packs we receive

On Thu, Aug 18, 2016 at 03:15:50PM +0200, Christian Couder wrote: > Diff with previous v1 version > ~ > > diff --git a/t/t5546-push-limits.sh b/t/t5546-push-limits.sh > index b38d508..09e958f 100755 > --- a/t/t5546-push-limits.sh > +++ b/t/t5546-push-limits.sh > @@

Re: git format-patch --break-rewrites broken in 2.9.3

Hi Olaf, On Thu, 18 Aug 2016, Olaf Hering wrote: > This command used to create a diff which can be consumed by patch. But > at least with 2.9.3 it just gives a rename output: > > git format-patch \ > --no-signature \ > --stdout \ > --break-rewrites \ >

Re: [PATCH v7 3/7] diff: prepare for additional submodule formats

On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller wrote: > 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

Re: git format-patch --break-rewrites broken in 2.9.3

Johannes Schindelin writes: > Hi Olaf, > >> --break-rewrites \ >> --keep-subject \ >> >> 95fa0405c5991726e06c08ffcd8ff872f7fb4f2d^..95fa0405c5991726e06c08ffcd8ff872f7fb4f2d >> >> What must be done now to get a usable patch? > > Maybe --no-renames?

Re: [PATCH 3/4] cat-file --textconv/--filters: allow specifying the path separately

Johannes Schindelin writes: > There are circumstances when it is relatively easy to figure out the > object name for a given path, but not the revision. For example, when revision of the containing tree, I presume? > Let's simplify this dramatically, because we do