Re: [PATCH v9 33/41] environment: add set_index_file()

On Mon, Aug 1, 2016 at 10:40 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Stefan Beller writes: >> >>> In cache.h we have a NO_THE_INDEX_COMPATIBILITY_MACROS, >>> and lots of >>> #define foo_bar(..) frob_bar(_index, (..))

2.9.2 test failures on macOS

I have two test failures to report in git 2.9.2 on macOS: t3210-pack-refs.sh has not changed between 2.8.4 and 2.9.2. This test passed fine with 2.8.4, but it now fails with 2.9.2 at: not ok 26 - retry acquiring packed-refs.lock # # LOCK=.git/packed-refs.lock && #

Re: [PATCH] blame: drop strdup of string literal

On Tue, Aug 2, 2016 at 6:52 AM, Jeff King wrote: > On Tue, Jun 14, 2016 at 01:05:41AM -0400, Jeff King wrote:> >> On Tue, Jun 14, 2016 at 12:32:15AM -0400, Eric Sunshine wrote: >> > > + struct string_list range_list = STRING_LIST_INIT_NODUP; >> > >> > Related to this series,

[RFC/PATCH] rebase--interactive: Add "sign" command

This is similar to the existing "reword" command in that it can be used to update the commit message the difference is that the editor presented to the user for the commit. It provides a useful shorthand for "exec git commit --amend --no-edit -s" Signed-off-by: Chris Packham

[PATCH v2] t4130: work around Windows limitation

On Windows, it is already pretty expensive to try to recreate the stat() data that Git assumes is cheap to obtain. To make things halfway decent in performance, we even have to skip emulating the inode and to determine the number of hard links. This is not a huge problem, usually, as either the

Re: [PATCH v9 33/41] environment: add set_index_file()

On Mon, Aug 1, 2016 at 7:24 PM, Stefan Beller wrote: > On Sat, Jul 30, 2016 at 10:25 AM, Christian Couder > wrote: > > I have reviewed briefly all 41 patches and generally they look good to me. > There were some nits, which should not stop us from

Ich werde für Ihre dringende Antwort warten

Hallo, Mein Name ist Chan Chak ein Bankmanager mit einer Investmentbank , ich ein Geschäft zum gegenseitigen Nutzen haben, die Übertragung von großen Geldsumme. Erhalten Sie für weitere Details zu mir zurück, wenn Sie interessiert sind. (chanjohnc...@gmail.com) CHAN CHAK -- To unsubscribe

Re: [PATCH v2] t4130: work around Windows limitation

Hi Hannes, On Wed, 3 Aug 2016, Johannes Sixt wrote: > This fell through the cracks, I think. I marked it as v2 because > there is a minor fixup in the commit message. It appears that it did fall through the cracks. Given that it would make my life substantially easier (because I run the test

patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Hi Junio, On Tue, 2 Aug 2016, Junio C Hamano wrote: > So either I should change my workflow and mention any and all > typofixes in my review comments (which consumes the review > bandwidth), or I should force patch authors to do the "fetch from > 'pu' and replace" somehow to avoid this kind of

Re: [PATCH v4 0/8] status: V2 porcelain status

Hi Junio, On Tue, 2 Aug 2016, Jeff Hostetler wrote: > 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] I was wondering...

Re: Making file permissions match

On Wed, Aug 03, 2016 at 09:46:06AM -0400, jonsm...@gmail.com wrote: > I'm working with some Windows programmers that don't believe in file > permissions They keep sending me zip files of their source tree. I > have my copy of the tree in git on Linux with all of the correct file > permissions. >

Re: Making file permissions match

Hi Jon, On Wed, 3 Aug 2016, jonsm...@gmail.com wrote: > I'm working with some Windows programmers that don't believe in file > permissions They keep sending me zip files of their source tree. I > have my copy of the tree in git on Linux with all of the correct file > permissions. > > So I

Re: Making file permissions match

On Wed, Aug 3, 2016 at 10:07 AM, Torsten Bögershausen wrote: > On Wed, Aug 03, 2016 at 09:46:06AM -0400, jonsm...@gmail.com wrote: >> I'm working with some Windows programmers that don't believe in file >> permissions They keep sending me zip files of their source tree. I >> have

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Hi Junio, On Wed, 3 Aug 2016, Junio C Hamano wrote: > On Wed, Aug 3, 2016 at 4:59 AM, Johannes Schindelin > wrote: > > > > I disagree, however, with the suggestion to sift through your `pu` branch > > and to somehow replace local branches with the commits found

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

On Wed, Aug 3, 2016 at 4:59 AM, Johannes Schindelin wrote: > > I disagree, however, with the suggestion to sift through your `pu` branch > and to somehow replace local branches with the commits found there. To be more in line with the "e-mailed patch" workflow, I

Re: [PATCH v2] t4130: work around Windows limitation

Johannes Sixt writes: > This fell through the cracks, I think. I marked it as v2 because > there is a minor fixup in the commit message. Thanks. The patch itself seems to got whitespace damaged somewhere between you and me, which I fixed up, but there may be similar damage to

Re: [PATCH 1/1 v2] pager: move pager-specific setup into the build

On Mon, Aug 01, 2016 at 09:49:37PM +, Eric Wong wrote: > +static void setup_pager_env(struct argv_array *env) > +{ > + const char *pager_env = PAGER_ENV; > + > + while (*pager_env) { > + struct strbuf buf = STRBUF_INIT; > + const char *cp = strchrnul(pager_env,

Re: 2.9.2 test failures on macOS

Hi Jeremy, On Wed, 3 Aug 2016, Jeremy Huddleston Sequoia wrote: > I have two test failures to report in git 2.9.2 on macOS: > > > t3210-pack-refs.sh has not changed between 2.8.4 and 2.9.2. This test passed > fine with 2.8.4, but it now fails with 2.9.2 at: > > not ok 26 - retry acquiring

[OT] USENIX paper on Git

Hello everyone, I will be presenting a paper regarding the Git metadata issues that we discussed at the beginning on the year on USENIX '16. I'm writing To make everyone in this ML aware that this work exists and to bring everyone into the loop. I'm open for feedback and corrections. If anything

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

Johannes Schindelin writes: > ... my Git garden shears [*1*] (essentially, what > git rebase --interactive --preserve-merges *should* have been). Any plan to fold it into "git rebase -i" as a new (improved) mode of operation, by the way? > However, I could imagine

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

Hi Junio, On Wed, 3 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > ... my Git garden shears [*1*] (essentially, what > > git rebase --interactive --preserve-merges *should* have been). > > Any plan to fold it into "git rebase -i" as a new

Re: [PATCH] apply: mark some file-local symbols static

Hi Christian, On Wed, 3 Aug 2016, Christian Couder wrote: > Now there are different options to fix this: > > 1) remove the symbols in 9f87c22 ("apply: refactor `git apply` option > parsing") at the end of the series, or > 2) move 4820e13 (apply: make some parsing functions static again) at >

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

Hi Chris, On Wed, 3 Aug 2016, Chris Packham wrote: > This is similar to the existing "reword" command in that it can be used > to update the commit message the difference is that the editor presented > to the user for the commit. It provides a useful shorthand for "exec git > commit --amend

Fast Loans

Apply for a loan at 2% reply to this Email for more Info -- 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

Re: [OT] USENIX paper on Git

Hi Santiago, On Wed, 3 Aug 2016, Santiago Torres wrote: > I'm open for feedback and corrections. If anything seems odd imprecise > to the community, I can make an errata in the presentation (at least). > I'll also try to work towards making corrections anywhere if possible; > this is my first

Re: [OT] USENIX paper on Git

> share things before they are published. Thankfully, this is OK in > > USENIX's book. Here's the link: > > http://i2.cdn.turner.com/cnnnext/dam/assets/160730192650-14new-week-in-politics-super-169.jpg > > While I had a good laugh, I am wondering whether this is the correct link? Oh my god,

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

On Wed, Aug 3, 2016 at 5:24 AM, Jakub Narębski wrote:> > Could you apply the first part (the first patch) of the series, > namely: > >- clarify %f documentation Thanks. That's a good idea. > P.S. I guess that filter..process series is considered > pre-cooking? Yes.

Re: 2.9.2 test failures on macOS

Jeremy Huddleston Sequoia writes: > t3700-add.sh recently added the 'git add --chmod=-x stages an executable file > with -x' test. This test passes when run as a normal user but fails when run > as root: > > $ ./t3700-add.sh This has been spotted and corrected on the

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

Chris Packham writes: > This is similar to the existing "reword" command in that it can be used > to update the commit message the difference is that the editor presented > to the user for the commit. It provides a useful shorthand for "exec git > commit --amend

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

Hi Chris, On Wed, 3 Aug 2016, Johannes Schindelin wrote: > I can understand how this "sign" command helps you. I myself wished for > new commands when working on my Git garden shears [*1*] (essentially, what > git rebase --interactive --preserve-merges *should* have been). And of course I

Re: [PATCH v4 0/8] status: V2 porcelain status

On Wed, Aug 3, 2016 at 8:09 AM, Johannes Schindelin wrote: > Hi Junio, > > Any word when it will be included in `pu`, at least? I've been waiting to see that the amount and quality of comments from others indicate that the series passed the phase that goes through

[PATCH v2] t7063: work around FreeBSD's lazy mtime update feature

Let's start with the commit message of [1] from freebsd.git [2] Sync timestamp changes for inodes of special files to disk as late as possible (when the inode is reclaimed). Temporarily only do this if option UFS_LAZYMOD configured and softupdates aren't enabled. UFS_LAZYMOD is

Re: [PATCH v2] t7063: work around FreeBSD's lazy mtime update feature

Nguyễn Thái Ngọc Duy writes: > v2 goes with Junio's suggestion (good one!). Ehh, have you even read what you copied and pasted? "this and that" and "blah" are meant to be placeholders for you to fill in. I am not sure if "-exec ls -ld" is a good idea. Doesn't "find" by

Re: [PATCH v4 0/8] status: V2 porcelain status

Hi Junio, On Wed, 3 Aug 2016, Junio C Hamano wrote: > On Wed, Aug 3, 2016 at 8:09 AM, Johannes Schindelin > wrote: > > > Any word when it will be included in `pu`, at least? > > I've been waiting to see that the amount and quality of > comments from others indicate

refactoring a branch with e.g. meld how?

I've been asked to seriously reorganize and compress a big branch (75 commits) What I'd like to do is make branches foo_flattened with all commits and branch foo_reorganized starting at the ancestor, then work by incrementally doing meld/commit/meld/commit/etc from foo_flattened into

Re: [PATCH 8/8] diff: improve positioning of add/delete blocks in diffs

On Wed, Aug 3, 2016 at 3:36 PM, Michael Haggerty wrote: > On 08/04/2016 12:29 AM, Jacob Keller wrote: >> On Wed, Aug 3, 2016 at 3:00 PM, Michael Haggerty >> wrote: >> It seems odd to be that a line with "199" spaces and nothing else will >> return

Hello Friend

Hello Friend How is life been with you and your present health condition i hope you are doing great? i saw your profile and i like it so i decided to contact you for a possible relationship and other good business/investment i want to discuss with you,remember that age,race nor ethnic will not

Re: [PATCH v3] pager: move pager-specific setup into the build

On Thu, Aug 04, 2016 at 03:43:01AM +, Eric Wong wrote: > +PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))" > +PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ)) > +BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)' Here we set up CQ_SQ, but there is no PAGER_ENV_SQ. And then... > @@

Re: [[PATCH v2] 4/4] rebase: avoid computing unnecessary patch IDs

Junio C Hamano writes: > I do not think negative (or non-zero) return is an "abuse" at all. > It is misleading in the context of the function whose name has "cmp" > in it, but that is not the fault of this function, rather, the > breakage is more in the API that calls a

Re: [PATCH v3 10/10] convert: add filter..process option

[Some of those answers might have been invalidated by v4] W dniu 01.08.2016 o 19:55, Lars Schneider pisze: >> On 01 Aug 2016, at 00:19, Jakub Narębski wrote: >> W dniu 30.07.2016 o 01:38, larsxschnei...@gmail.com pisze: >> [...] >>> +static int multi_packet_read(int fd_in,

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

On Thu, Aug 4, 2016 at 6:08 AM, Jeff King wrote: > On Wed, Aug 03, 2016 at 09:08:48AM -0700, Junio C Hamano wrote: > >> > However, I could imagine that we actually want this to be more extensible. >> > After all, all you are doing is to introduce a new rebase -i command that >> >

[PATCH v3] pager: move pager-specific setup into the build

From: Junio C Hamano Allowing PAGER_ENV to be set at build-time allows us to move pager-specific knowledge out of our build. This allows us to set a better default for FreeBSD more(1), which misbehaves if MORE environment variable is left empty, but accepts the same variables

Re: [PATCH v2] t4130: work around Windows limitation

Am 03.08.2016 um 17:50 schrieb Junio C Hamano: Johannes Sixt writes: The patch itself seems to got whitespace damaged somewhere between you and me, which I fixed up, Sorry for the damaged patch. I forgot that Thunderbird's "Send again" feature as well as copying and pasting

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

On Thu, Aug 4, 2016 at 2:31 AM, Johannes Schindelin wrote: > Hi Chris, > > On Wed, 3 Aug 2016, Chris Packham wrote: > >> This is similar to the existing "reword" command in that it can be used >> to update the commit message the difference is that the editor presented

Re: [TIG PATCH] test: make diff/log work with git 2.9

On Tue, Jun 14, 2016 at 4:34 AM, Michael J Gruber wrote: > git 2.9.0 switches the default for diff.renames to true. > > Set this to false in config so that the test suite runs unmodified for > old and new git. Thanks! -- Jonas Fonseca -- To unsubscribe from this

Re: What's cooking (interim report)

On Wed, Aug 03, 2016 at 04:06:20PM -0700, Junio C Hamano wrote: > * jk/parseopt-string-list (2016-08-03) 1 commit > - blame: drop strdup of string literal > > A recent API change to parse_opt_string_list() introduced a small > unintended memory leak in the command line parsing of "git blame",

Re: [PATCH v2] t7063: work around FreeBSD's lazy mtime update feature

On Wed, Aug 3, 2016 at 6:16 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> v2 goes with Junio's suggestion (good one!). > > Ehh, have you even read what you copied and pasted? "this and that" > and "blah" are meant to be placeholders for

[PATCH v4 02/12] pkt-line: add direct_packet_write() and direct_packet_write_data()

From: Lars Schneider Sometimes pkt-line data is already available in a buffer and it would be a waste of resources to write the packet using packet_write() which would copy the existing buffer into a strbuf before writing it. If the caller has control over the buffer

[PATCH v4 01/12] 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 | 18 -- 1

Re: [PATCH] import-tars: support hard links

Johannes Schindelin writes: > Previously, we simply treated hard links as if they were plain files > with size 0, ignoring the link type "1" and hence the link target. Nicely spotted and explained. > Signed-off-by: Johannes Schindelin >

Re: [PATCH v4 0/8] status: V2 porcelain status

Johannes Schindelin writes: > On Wed, 3 Aug 2016, Junio C Hamano wrote: > >> On Wed, Aug 3, 2016 at 8:09 AM, Johannes Schindelin >> wrote: >> >> > Any word when it will be included in `pu`, at least? >> >> I've been waiting to see that

Re: [PATCH v4 11/12] convert: add filter..process option

larsxschnei...@gmail.com writes: > packet: git< git-filter-protocol\n > packet: git< version=2\n > packet: git< capabilities=clean smudge\n During the discussion on the future of pack-protocol, it was pointed out that having to shove all capabilities on a single

Re: [OT] USENIX paper on Git

On Wed, Aug 3, 2016 at 10:22 AM, Santiago Torres wrote: > On Wed, Aug 03, 2016 at 10:14:21AM -0700, Stefan Beller wrote: >> On Wed, Aug 3, 2016 at 8:25 AM, Santiago Torres wrote: >> > > share things before they are published. Thankfully, this is OK in >> >> >

Re: [OT] USENIX paper on Git

On Wed, Aug 03, 2016 at 10:35:39AM -0700, Stefan Beller wrote: > On Wed, Aug 3, 2016 at 10:22 AM, Santiago Torres wrote: > > On Wed, Aug 03, 2016 at 10:14:21AM -0700, Stefan Beller wrote: > >> On Wed, Aug 3, 2016 at 8:25 AM, Santiago Torres wrote: > >> > >

Re: appending a pattern to the default "diff.cpp.xfuncname"

On Wed, Aug 03, 2016 at 12:16:14PM +0200, Laszlo Ersek wrote: > I've used diff..xfuncname with great success for file s that > I defined myself. However, now I would like to append an extra pattern > to the TYPE=cpp case (for which git has builtin patterns). Is there an > easy way to do this? >

Re: [OT] USENIX paper on Git

Jeff King writes: > Here are my comments on the work itself. They're critical, but meant in > a friendly way. :) A tl;dr version of your analysis seems to me that "you solve it the same way as the push certificate solves it (including the limitation the latter has)". If that is

Re: [OT] USENIX paper on Git

Hello, > Here are my comments on the work itself. They're critical, but meant in > a friendly way. :) > Thanks! If anything, the community here has been incredibly helpful in helping me understand everything. > As far as the attack goes, I'm still not convinced this is all that > _interesting_

[PATCH v3] t7063: work around FreeBSD's lazy mtime update feature

Let's start with the commit message of [1] from freebsd.git [2] Sync timestamp changes for inodes of special files to disk as late as possible (when the inode is reclaimed). Temporarily only do this if option UFS_LAZYMOD configured and softupdates aren't enabled. UFS_LAZYMOD is

Re: [OT] USENIX paper on Git

On Wed, Aug 03, 2016 at 01:45:00PM -0400, Santiago Torres wrote: > > - if there is a chain of signatures, the attacker must follow the > > chain, but they can always withhold links from the end. So imagine a > > repository has held a sequence of signed states (A, B, C), that B > >

Re: appending a pattern to the default "diff.cpp.xfuncname"

On Wed, Aug 03, 2016 at 08:34:28PM +0200, Jakub Narębski wrote: > > Unfortunately, no, the config system has no notion of "append to this > > value". > > And I think adding such capability would not be easy. Well, perhaps > we could support '+=' in addition to '='? We could, but it would be

Re: [OT] USENIX paper on Git

On Wed, Aug 03, 2016 at 10:58:31AM -0400, Santiago Torres wrote: > I will be presenting a paper regarding the Git metadata issues that we > discussed at the beginning on the year on USENIX '16. I'm writing To > make everyone in this ML aware that this work exists and to bring > everyone into the

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

On Wed, Aug 3, 2016 at 9:07 AM, Johannes Schindelin wrote: > Hi Junio, > > On Wed, 3 Aug 2016, Junio C Hamano wrote: > >> On Wed, Aug 3, 2016 at 4:59 AM, Johannes Schindelin >> wrote: >> > >> > I disagree, however, with the suggestion to

Re: [OT] USENIX paper on Git

On Wed, Aug 03, 2016 at 01:58:54PM -0400, Jeff King wrote: > On Wed, Aug 03, 2016 at 01:45:00PM -0400, Santiago Torres wrote: > > > > - if there is a chain of signatures, the attacker must follow the > > > chain, but they can always withhold links from the end. So imagine a > > >

Re: appending a pattern to the default "diff.cpp.xfuncname"

W dniu 03.08.2016 o 20:02, Jeff King pisze: > On Wed, Aug 03, 2016 at 12:16:14PM +0200, Laszlo Ersek wrote: > >> I've used diff..xfuncname with great success for file s that >> I defined myself. However, now I would like to append an extra pattern >> to the TYPE=cpp case (for which git has

Re: 2.9.2 test failures on macOS

> On Aug 3, 2016, at 07:35, Johannes Schindelin > wrote: > > Hi Jeremy, > > On Wed, 3 Aug 2016, Jeremy Huddleston Sequoia wrote: > >> I have two test failures to report in git 2.9.2 on macOS: >> >> >> t3210-pack-refs.sh has not changed between 2.8.4 and 2.9.2.

Re: [PATCHv3 6/7] submodule--helper: add remote-branch helper

On Thu, Jul 28, 2016 at 05:44:08PM -0700, Stefan Beller wrote: > +static const char *remote_submodule_branch(const char *path) > +{ > + const struct submodule *sub; > + gitmodules_config(); > + git_config(submodule_config, NULL); > + > + sub = submodule_from_path(null_sha1, path);

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

On Wed, Aug 03, 2016 at 09:53:18AM -0700, Junio C Hamano wrote: > > Leaving aside Dscho's questions of whether pulling patches from email is > > convenient for most submitters (it certainly is for me, but I recognize > > that it is not for many), I would much rather see incremental fixup > >

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

On Wed, Aug 03, 2016 at 08:33:12AM -0700, Junio C Hamano wrote: > On Wed, Aug 3, 2016 at 4:59 AM, Johannes Schindelin > wrote: > > > > I disagree, however, with the suggestion to sift through your `pu` branch > > and to somehow replace local branches with the commits

Re: [OT] USENIX paper on Git

Santiago Torres writes: >> Submodules actually track commits, not tags or branches. >> >> This is confusing for some users, e.g. the user intended to track >> a library at version 1.1, but it tracks 1234abcd instead (which is what >> 1.1 points at). > > I'm assuming that git

Re: [OT] USENIX paper on Git

On Wed, Aug 03, 2016 at 10:35:54AM -0700, Junio C Hamano wrote: > Santiago Torres writes: > > >> Submodules actually track commits, not tags or branches. > >> > >> This is confusing for some users, e.g. the user intended to track a > >> library at version 1.1, but it tracks

Designing the filter process protocol (was: Re: [PATCH v3 10/10] convert: add filter..process option)

[I'm sorry for taking so long in writing this, as I see there is v4 already] Greetings, I'll answer to individual emails in more detail later, but I'd like to go back to the drawing board, and attempt to summarize the discussion and the proposal so far. The ultimate goal is to be able to run

[PATCH v4 12/12] convert: add filter..process shutdown command option

From: Lars Schneider Add the "shutdown" capability to the `filter..process` filter protocol. If a filter supports this capability then Git will send the "shutdown" command and wait until the filter answers. This gives the filter the opportunity to perform cleanup tasks.

[PATCH v4 11/12] 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 v4 00/12] Git filter protocol

From: Lars Schneider Hi, thanks a lot for the very helpful reviews! Patch 1-10 are preparation. Patch 11 and 12 the real feature. Diff to v3: * simplify protocol, remove size information * run clean_on_exit_handler() only on SIGTERM (Hannes) * move hex() macro inside

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Jeff King writes: > On Wed, Aug 03, 2016 at 08:33:12AM -0700, Junio C Hamano wrote: > >> On Wed, Aug 3, 2016 at 4:59 AM, Johannes Schindelin >> wrote: >> > >> > I disagree, however, with the suggestion to sift through your `pu` branch >> > and to

Re: [OT] USENIX paper on Git

On Wed, Aug 3, 2016 at 8:25 AM, Santiago Torres wrote: > > share things before they are published. Thankfully, this is OK in >> > USENIX's book. Here's the link: >> > http://i2.cdn.turner.com/cnnnext/dam/assets/160730192650-14new-week-in-politics-super-169.jpg >> >> While I had

Re: [OT] USENIX paper on Git

On Wed, Aug 03, 2016 at 10:14:21AM -0700, Stefan Beller wrote: > On Wed, Aug 3, 2016 at 8:25 AM, Santiago Torres wrote: > > > share things before they are published. Thankfully, this is OK in > >> > USENIX's book. Here's the link: > >> >

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

On Wed, Aug 03, 2016 at 09:08:48AM -0700, Junio C Hamano wrote: > > However, I could imagine that we actually want this to be more extensible. > > After all, all you are doing is to introduce a new rebase -i command that > > does nothing else than shelling out to a command. > > Yup, I tend to

Re: appending a pattern to the default "diff.cpp.xfuncname"

On 08/03/16 20:02, Jeff King wrote: > On Wed, Aug 03, 2016 at 12:16:14PM +0200, Laszlo Ersek wrote: > >> I've used diff..xfuncname with great success for file s that >> I defined myself. However, now I would like to append an extra pattern >> to the TYPE=cpp case (for which git has builtin

Re: obsolete index in wt_status_print after pre-commit hook runs

Am 15.07.2016 um 6:03 nachm. schrieb Junio C Hamano : > > Ahh, I misremembered. 2888605c (builtin-commit: fix partial-commit > support, 2007-11-18) does consider the possibility that pre-commit > may have modified the index contents after we take control back from > that hook,

[PATCH v4 05/12] 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 v4 08/12] 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 v4 09/12] 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 v4 03/12] pkt-line: add packet_flush_gentle()

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_gentle() which writes a pkt-line flush packet and returns `0` for success and `1` for failure. Signed-off-by: Lars

[PATCH v4 04/12] pkt-line: call packet_trace() only if a packet is actually send

From: Lars Schneider The packet_trace() call is not ideal in format_packet() as we would print a trace when a packet is formatted and (potentially) when the packet is actually send. This was no problem up until now because format_packet() was only used by one function.

[PATCH v4 10/12] 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

[PATCH v4 07/12] run-command: add clean_on_exit_handler

From: Lars Schneider Some commands might need to perform cleanup tasks on exit. Let's give them an interface for doing this. Please note, that the cleanup callback is not executed if Git dies of a signal. The reason is that only "async-signal-safe" functions would be

[PATCH v4 06/12] 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

Re: [PATCH v3] t7063: work around FreeBSD's lazy mtime update feature

On Wed, Aug 3, 2016 at 10:45 AM, Nguyễn Thái Ngọc Duy wrote: > v3 differs from v2 in one line > > --- a/t/t7063-status-untracked-cache.sh > +++ b/t/t7063-status-untracked-cache.sh > @@ -11,7 +11,7 @@ test_description='test untracked cache' > # containing

Re: [PATCH v3 02/10] pkt-line: add direct_packet_write() and direct_packet_write_data()

[This response might have been invalidated by v4] W dniu 01.08.2016 o 14:00, Lars Schneider pisze: >> On 30 Jul 2016, at 12:49, Jakub Narębski wrote: >> W dniu 30.07.2016 o 01:37, larsxschnei...@gmail.com pisze: >>> >>> Sometimes pkt-line data is already available in a buffer

Re: [PATCH v3] t7063: work around FreeBSD's lazy mtime update feature

Junio C Hamano writes: > If you mean to tell the user "I won't describe it in detail, if you > really want to know, > go run blame yourself", spell it out like so. I was hoping that you > can summarize > in-line there to help the readers here. Here is a proposed fixup.

Re: [PATCH] pass constants as first argument to st_mult()

Jeff King writes: > On Wed, Aug 03, 2016 at 12:41:30PM -0700, Junio C Hamano wrote: > >> On Wed, Aug 3, 2016 at 12:13 PM, Jeff King wrote: >> > On Mon, Aug 01, 2016 at 03:31:45PM -0700, Junio C Hamano wrote: >> > >> > I think in my head I rewrite any multiplication

Re: [PATCH] pass constants as first argument to st_mult()

On Wed, Aug 3, 2016 at 9:13 PM, Jeff King wrote: > On Mon, Aug 01, 2016 at 03:31:45PM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >> >> *1* I have a slight suspicion that this is cultural, i.e. how >> >> arithmetic is taught in grade schools. When an

Re: [RFC/PATCH v11 02/13] bisect: rewrite `check_term_format` shell function in C

Hey Junio, On Tue, Aug 2, 2016 at 11:01 PM, Junio C Hamano wrote: > Pranit Bauva writes: > >> +/* >> + * Check whether the string `term` belongs to the set of strings >> + * included in the variable arguments. >> + */ >> +static int one_of(const char

Re: [PATCHv3 6/7] submodule--helper: add remote-branch helper

On Wed, Aug 03, 2016 at 01:11:51PM -0700, Stefan Beller wrote: > > Coverity complains about "sub" being NULL here, and indeed, it seems > > like an easy segfault: > > > > $ ./git submodule--helper remote-branch foo > > Segmentation fault > > > > I guess this should return NULL in that case.

Re: [RFC/PATCH v11 03/13] bisect--helper: `write_terms` shell function in C

Hey Junio, On Tue, Aug 2, 2016 at 11:08 PM, Junio C Hamano wrote: > Pranit Bauva writes: > >> +static int write_terms(const char *bad, const char *good) >> +{ >> + FILE *fp; >> + int res; >> + >> + if (!strcmp(bad, good)) >> +

Re: [PATCH v4 11/12] convert: add filter..process option

larsxschnei...@gmail.com writes: > +#define FILTER_CAPABILITIES_CLEAN(1u<<0) > +#define FILTER_CAPABILITIES_SMUDGE (1u<<1) > +#define FILTER_SUPPORTS_CLEAN(type) ((type) & FILTER_CAPABILITIES_CLEAN) > +#define FILTER_SUPPORTS_SMUDGE(type) ((type) & FILTER_CAPABILITIES_SMUDGE) I would

Re: [RFC/PATCH v11 09/13] bisect--helper: `bisect_write` shell function in C

Hey Junio, On Wed, Aug 3, 2016 at 3:47 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Pranit Bauva writes: >> >>> Reimplement the `bisect_write` shell function in C and add a >>> `bisect-write` subcommand to `git

Re: [PATCH] pass constants as first argument to st_mult()

On Mon, Aug 01, 2016 at 03:31:45PM -0700, Junio C Hamano wrote: > Jeff King writes: > > >> *1* I have a slight suspicion that this is cultural, i.e. how > >> arithmetic is taught in grade schools. When an apple costs 30 yen > >> and I have 5 of them, I was taught to multiply

Re: [PATCH] pass constants as first argument to st_mult()

On Wed, Aug 03, 2016 at 12:41:30PM -0700, Junio C Hamano wrote: > On Wed, Aug 3, 2016 at 12:13 PM, Jeff King wrote: > > On Mon, Aug 01, 2016 at 03:31:45PM -0700, Junio C Hamano wrote: > > > > I think in my head I rewrite any multiplication like "N of M" as having > > "N" as the

  1   2   >