On Thu, Aug 10, 2017 at 01:49:24PM -0700, Junio C Hamano wrote:
> The lower 4-byte of moff (before incrementing it with msize) were
> already encoded to the output stream before this hunk. Shouldn't
> we be checking if moff would fit in uint32_t _before_ that happens?
moff is otherwise only decre
Please help me understand how this command works. There is one case in the
linux kernel repository that puzzles me. Let's consider patch "drm/i915/
execlists: Reset RING registers upon resume" [1]. This patch was committed 641
commits after version 4.8-rc2:
~$ git describe bafb2f7d4755bf1571bd5e9a
On Thu, Aug 10, 2017 at 07:09:02PM -0400, Jeff King wrote:
> The first is "should we eventually drop support for antiquated versions
> of dependencies?". And the argument in favor is the one I was making
> here: besides lowering maintenance cost, it is more honest to our users
> about what to expe
On Wed, Aug 09, 2017 at 05:54:46PM +0200, René Scharfe wrote:
> Use a NULL-and-NUL check to see if we have a prefix and consistently use
> C string functions on it instead of storing its length in a member of
> struct apply_state. This avoids strlen() calls and simplifies the code.
I had to read
On 11/08/17 00:10, Jeff King wrote:
> On Fri, Aug 11, 2017 at 12:02:49AM +0100, Ramsay Jones wrote:
>
>>> But some of those things are not 1:1 mappings with normalization. For
>>> instance, --json presumably implies --only-trailers. Or are we proposing
>>> to break the whole commit message down
On 11/08/17 01:23, Jeff King wrote:
On Fri, Aug 11, 2017 at 01:17:51AM +0200, Tom G. Christensen wrote:
OK, thanks for double-checking. I'm still puzzled why your build
succeeds and mine does not.
I know what's going on now and it's so simple.
Red Hats version of curl 7.15.5 includes a number
On Fri, Aug 11, 2017 at 01:17:51AM +0200, Tom G. Christensen wrote:
> > OK, thanks for double-checking. I'm still puzzled why your build
> > succeeds and mine does not.
>
> I know what's going on now and it's so simple.
> Red Hats version of curl 7.15.5 includes a number of patches including one
On Thu, Aug 10, 2017 at 02:32:55PM -0400, Kevin Willford wrote:
> @@ -1493,6 +1496,8 @@ int cmd_format_patch(int argc, const char **argv, const
> char *prefix)
> OPT_FILENAME(0, "signature-file", &signature_file,
> N_("add a signature from a file")),
>
On 11/08/17 00:54, Jeff King wrote:
On Fri, Aug 11, 2017 at 12:23:42AM +0200, Tom G. Christensen wrote:
Er, sorry if I'm being dense, but how? Are you suggesting that by
removing the callsite of get_curl_allowed_protocols(), the compiler
might elide the now-dead code completely? I could certai
On Thu, Aug 10, 2017 at 03:48:31PM -0700, Junio C Hamano wrote:
> Kevin Willford writes:
>
> > Changes since last patch:
> > 1. Use start_progress_delay so progress isn't shown if generating
> >the patches is fast enough
> > 2. Updated to have text of "Generating patches"
> > 3. Only show pr
On Fri, Aug 11, 2017 at 12:02:49AM +0100, Ramsay Jones wrote:
> > But some of those things are not 1:1 mappings with normalization. For
> > instance, --json presumably implies --only-trailers. Or are we proposing
> > to break the whole commit message down into components and output it all
> > as
On Thu, Aug 10, 2017 at 03:17:06PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Thu, Aug 10, 2017 at 11:36:41AM +0200, Johannes Schindelin wrote:
> >
> >> Hopefully I had better luck expressing my concerns this time?
> >
> > I understand your argument much better now. I'm still not
On 10/08/17 22:10, Jeff King wrote:
> On Thu, Aug 10, 2017 at 11:06:40PM +0200, Christian Couder wrote:
>
Related to this, I wonder if people might want to "normalize" in
different ways later. If that happens, we might regret having called
this option "--normalize" instead of "--o
On Fri, Aug 11, 2017 at 12:23:42AM +0200, Tom G. Christensen wrote:
> > > I just built a pristine 2.14.0 on CentOS 5 with curl 7.15.5. No problems
> > > at
> > > all neither with building nor with running the testsuite.
> >
> > As you can see, this does not compile for me. What's going on?
> >
Kevin Willford writes:
> Changes since last patch:
> 1. Use start_progress_delay so progress isn't shown if generating
>the patches is fast enough
> 2. Updated to have text of "Generating patches"
> 3. Only show progress when the --progress flag is passed
> 4. In the rebase script check stder
Jonathan Tan writes:
> On Thu, 10 Aug 2017 14:19:59 -0700
> Junio C Hamano wrote:
>
>> Jonathan Tan writes:
>>
>> > Here is the complete patch set. I have only moved the exported functions
>> > that operate with packfiles and their static helpers - for example,
>> > static functions like fresh
Martin Koegler writes:
> From: Martin Koegler
>
> Signed-off-by: Martin Koegler
> ---
Please do not start your patch series from 5/9 when there is no 1/9,
2/9, 3/9, and 4/9. It is seriously confusing.
I am guessing that you are trying to split the series into
manageable pieces by going per c
On 10/08/17 23:32, Jeff King wrote:
On Thu, Aug 10, 2017 at 10:33:18PM +0200, Tom G. Christensen wrote:
You've totally ignored the argument I made back then[1], and which I
reiterated in this thread. So I'll say it one more time: the more
compelling reason is not the #ifdefs, but the fact that
Kevin Willford writes:
> If there is not a pre-commit hook, there is no reason to discard
> the index and reread it.
>
> This change checks to presence of a pre-commit hook and then only
> discards the index if there was one.
>
> Signed-off-by: Kevin Willford
> ---
Peff already has done a good
Jeff King writes:
> On Thu, Aug 10, 2017 at 11:36:41AM +0200, Johannes Schindelin wrote:
>
>> Hopefully I had better luck expressing my concerns this time?
>
> I understand your argument much better now. I'm still not sure I agree.
>
> -Peff
I do not think "there are a dozen #ifdefs and I don't
Martin Koegler writes:
> For next. As this touches core functions, it will likely produce
> conflicts with other changes. Please provide the commit you want
> to rebase the patch on and I'll produce a V3.
No matter what base you pick, by the time the series is merged with
other topics in flight
On Thu, 10 Aug 2017 14:19:59 -0700
Junio C Hamano wrote:
> Jonathan Tan writes:
>
> > Here is the complete patch set. I have only moved the exported functions
> > that operate with packfiles and their static helpers - for example,
> > static functions like freshen_packed_object() that are used
Martin Koegler writes:
> From: Martin Koegler
>
> Signed-off-by: Martin Koegler
> ---
Thanks. I haven't thought things through but this looks sensible.
Will queue.
René Scharfe writes:
> getdelim(3) returns -1 at the end of the file and if it encounters an
> error, but sets errno only in the latter case. Set errno to zero before
> calling it to avoid misdiagnosing an out-of-memory condition due to a
> left-over value from some other function call.
>
> Repo
On Thu, 10 Aug 2017, Jeff King wrote:
> On Thu, Aug 10, 2017 at 10:56:40PM +0200, René Scharfe wrote:
> > getdelim(3) returns -1 at the end of the file and if it encounters an
> > error, but sets errno only in the latter case. Set errno to zero before
> > calling it to avoid misdiagnosing an ou
On Thu, Aug 10, 2017 at 11:36:41AM +0200, Johannes Schindelin wrote:
> Hopefully I had better luck expressing my concerns this time?
I understand your argument much better now. I'm still not sure I agree.
-Peff
On Thu, Aug 10, 2017 at 10:33:18PM +0200, Tom G. Christensen wrote:
> > You've totally ignored the argument I made back then[1], and which I
> > reiterated in this thread. So I'll say it one more time: the more
> > compelling reason is not the #ifdefs, but the fact that the older
> > versions are
On 08/10, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > On 08/10, Junio C Hamano wrote:
> >
> >> I vaguely recall that there was a discussion to have SubmitGit wait
> >> for success from Travis CI; if that is already in place, then I can
> >> sort of see how it would help individual cont
Jonathan Tan writes:
> Here is the complete patch set. I have only moved the exported functions
> that operate with packfiles and their static helpers - for example,
> static functions like freshen_packed_object() that are used only by
> non-pack-specific functions are not moved.
This will inter
On Thu, Aug 10, 2017 at 11:06:40PM +0200, Christian Couder wrote:
> >> Related to this, I wonder if people might want to "normalize" in
> >> different ways later. If that happens, we might regret having called
> >> this option "--normalize" instead of "--one-per-line" for example.
> >
> > What is
On Thu, Aug 10, 2017 at 9:44 PM, Stefan Beller wrote:
> On Thu, Aug 10, 2017 at 12:39 PM, Christian Couder
> wrote:
>> On Thu, Aug 10, 2017 at 8:37 PM, Jeff King wrote:
>>> On Thu, Aug 10, 2017 at 11:35:00AM -0700, Stefan Beller wrote:
>>>
On Thu, Aug 10, 2017 at 1:03 AM, Jeff King wrote:
On 09/08/17 23:47, Jeff King wrote:
On Wed, Aug 09, 2017 at 11:42:12PM +0200, Johannes Schindelin wrote:
I mean, if we even go out of our way to support the completely outdated
and obsolete .git/branches/ for what is likely a single user, it may not
be the worst to keep those couple of #ifdef gu
On Thu, Aug 10, 2017 at 10:56:40PM +0200, René Scharfe wrote:
> getdelim(3) returns -1 at the end of the file and if it encounters an
> error, but sets errno only in the latter case. Set errno to zero before
> calling it to avoid misdiagnosing an out-of-memory condition due to a
> left-over value
getdelim(3) returns -1 at the end of the file and if it encounters an
error, but sets errno only in the latter case. Set errno to zero before
calling it to avoid misdiagnosing an out-of-memory condition due to a
left-over value from some other function call.
Reported-by: Yaroslav Halchenko
Sugge
Martin Koegler writes:
> From: Martin Koegler
>
> Prevent generating delta offsets beyond 4G.
>
> Signed-off-by: Martin Koegler
> ---
> diff-delta.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/diff-delta.c b/diff-delta.c
> index 3d5e1ef..633883e 100644
> --- a/diff-delta.c
> ++
On Thu, Aug 10, 2017 at 01:07:07PM -0700, Junio C Hamano wrote:
> Perhaps we should teach the receiving end to notice that the varint
> data it reads encodes a size that is too large for it to grok and
> die. With that, we can safely move forward with whatever size_t
> each platform uses.
Yes, t
On Thu, Aug 10, 2017 at 12:57 PM, Kevin Willford wrote:
> Here are some of the performance numbers from the windows repo.
> I will work on writing a perf test for this change so that we
> have a better idea on smaller repo what the impact of this change
> is on them.
>
> | w/o | w
[I am resending this since the original does not seem to have made it to
the list, at least I cannot find it in any archives]
On 09/08/17 23:47, Jeff King wrote:
On Wed, Aug 09, 2017 at 11:42:12PM +0200, Johannes Schindelin wrote:
I mean, if we even go out of our way to support the completely
On Thu, 10 Aug 2017, Jeff King wrote:
> On Thu, Aug 10, 2017 at 09:58:37PM +0200, René Scharfe wrote:
> > > So the function is returning -1 and leaving ENOMEM in errno on
> > > Yaroslav's system.
> > > I wonder if we are truly hitting out of memory, though. The same
> > > symptom could bee see
On Thu, Aug 10, 2017 at 9:42 PM, Jeff King wrote:
> On Thu, Aug 10, 2017 at 09:39:21PM +0200, Christian Couder wrote:
>
>> > If you prefer the normalized form (and the input was line-broken in a
>> > way that you don't like), then this would convert to your preferred
>> > form. I agree that you co
Dear Sir/Madam
We are interested in your product, can we have your MOQ and FOB prices for
consideration and purchase
waiting for your response.
Best Regards,
Ms Tina Wang
(Purchasing Manager)
Email:purchasing.sale...@gmail.com
Dear Git users,
It is my pleasure to announce that Git for Windows 2.14.1 is available from:
https://git-for-windows.github.io/
Changes since Git for Windows v2.14.0(2) (August 7th 2017)
Note: there have been MinGit-only releases v2.12.2(3) and v2.13.1(3)
with backports of the important
Martin Koegler writes:
> From: Martin Koegler
Just a nitpick on the patch title. As "git shortlog --no-merges"
output would tell you, we try to prefix the title with a short name
of the area of codebase we are touching, followed by a colon and a
space and then remainder without extra capitaliz
On Thu, Aug 10, 2017 at 09:58:37PM +0200, René Scharfe wrote:
> > So the function is returning -1 and leaving ENOMEM in errno on
> > Yaroslav's system.
> >
> > I wonder if we are truly hitting out of memory, though. The same
> > symptom could bee seen if getdelim() does not touch errno when it
>
On Thu, Aug 10, 2017 at 11:49 AM, Jameson Miller
wrote:
Welcome to the Git mailing list. :)
> Teach Git to optionally show ignored directories when showing all
> untracked files. The git status command exposes the options to report
> ignored and/or untracked files. However, when reporting all un
Am 10.08.2017 um 20:56 schrieb Junio C Hamano:
> René Scharfe writes:
>
>> I doubt the type of file system matters. The questions are: How much
>> main memory do you have, what is git trying to cram into it, is there
>> a way to reduce the memory footprint or do you need to add more RAM?
>>
>>>
On 8/10/2017 3:03 PM, Jeff King wrote:
On Thu, Aug 10, 2017 at 11:58:34AM -0700, Stefan Beller wrote:
On Thu, Aug 10, 2017 at 11:47 AM, Kevin Willford wrote:
String formatting can be a performance issue when there are
hundreds of thousands of trees.
When changing this for the sake of perfo
Thank you Junio
On Thu, 10 Aug 2017, Junio C Hamano wrote:
> There is only one getdelim() call, which was introduced in v2.5.0
> timeframe, and it is used like this:
> r = getdelim(&sb->buf, &sb->alloc, term, fp);
> if (r > 0) {
> sb->len = r;
> return 0;
On Thu, Aug 10, 2017 at 12:39 PM, Christian Couder
wrote:
> On Thu, Aug 10, 2017 at 8:37 PM, Jeff King wrote:
>> On Thu, Aug 10, 2017 at 11:35:00AM -0700, Stefan Beller wrote:
>>
>>> On Thu, Aug 10, 2017 at 1:03 AM, Jeff King wrote:
>>> > The point of "--only-trailers" is to give a caller an out
Am 10.08.2017 um 16:43 schrieb Yaroslav Halchenko:
> On Thu, 10 Aug 2017, René Scharfe wrote:
>> Am 09.08.2017 um 19:39 schrieb Yaroslav Halchenko:
>>> More context (may be different issue(s)) could be found at
>>> http://git-annex.branchable.com/forum/git-annex_add_out_of_memory_error/
>>> but cur
Stefan Beller writes:
> On Thu, Aug 10, 2017 at 11:03 AM, Jeff King wrote:
>> On Thu, Aug 10, 2017 at 04:02:46AM -0400, Jeff King wrote:
>>
>>> On Wed, Aug 09, 2017 at 08:21:47AM -0400, Jeff King wrote:
>>>
>>> > This series teaches interpret-trailers to parse and output just the
>>> > trailers.
On Thu, Aug 10, 2017 at 09:39:21PM +0200, Christian Couder wrote:
> > If you prefer the normalized form (and the input was line-broken in a
> > way that you don't like), then this would convert to your preferred
> > form. I agree that you could potentially want the opposite (folding long
> > lines
On Thu, Aug 10, 2017 at 8:37 PM, Jeff King wrote:
> On Thu, Aug 10, 2017 at 11:35:00AM -0700, Stefan Beller wrote:
>
>> On Thu, Aug 10, 2017 at 1:03 AM, Jeff King wrote:
>> > The point of "--only-trailers" is to give a caller an output
>> > that's easy for them to parse. Getting rid of the
>> > n
Johannes Schindelin writes:
> Hi,
>
> On Wed, 9 Aug 2017, Stefan Beller wrote:
>
>> v1.2.0~121 (New tutorial, 2006-01-22) rewrote the tutorial such that the
>> original intent of 2ae6c70674 (Adapt tutorial to cygwin and add test case,
>> 2005-10-13) to test the examples from the tutorial doesn't
From: Martin Koegler
Signed-off-by: Martin Koegler
---
cache.h | 16 +++
sha1_file.c | 68 ++---
streaming.c | 2 +-
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/cache.h b/cache.h
index 9185763..9322303
From: Martin Koegler
Signed-off-by: Martin Koegler
---
block-sha1/sha1.c | 2 +-
block-sha1/sha1.h | 2 +-
ppc/sha1.c| 2 +-
ppc/sha1.h| 2 +-
sha1dc_git.c | 2 +-
sha1dc_git.h | 2 +-
sha1dc_git_ext.h | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --g
From: Martin Koegler
Signed-off-by: Martin Koegler
---
builtin/replace.c | 2 +-
commit.c | 14 +++---
commit.h | 8
fsck.c| 14 +++---
fsck.h| 2 +-
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/builtin/re
From: Martin Koegler
Signed-off-by: Martin Koegler
---
cache-tree.c | 6 +++---
cache-tree.h | 2 +-
cache.h | 6 +++---
convert.c | 18 +-
environment.c | 4 ++--
read-cache.c | 18 +-
6 files changed, 27 insertions(+), 27 deletions(-)
diff --g
On Thu, Aug 10, 2017 at 02:54:16PM -0400, Kevin Willford wrote:
> If there is not a pre-commit hook, there is no reason to discard
> the index and reread it.
>
> This change checks to presence of a pre-commit hook and then only
> discards the index if there was one.
Sounds like a smart optimizat
On Thu, Aug 10, 2017 at 11:58:34AM -0700, Stefan Beller wrote:
> On Thu, Aug 10, 2017 at 11:47 AM, Kevin Willford wrote:
> > String formatting can be a performance issue when there are
> > hundreds of thousands of trees.
>
> When changing this for the sake of performance, could you give
> an exa
On Thu, Aug 10, 2017 at 11:47 AM, Kevin Willford wrote:
> String formatting can be a performance issue when there are
> hundreds of thousands of trees.
When changing this for the sake of performance, could you give
an example (which kind of repository you need for this to become
a bottleneck? I p
René Scharfe writes:
> I doubt the type of file system matters. The questions are: How much
> main memory do you have, what is git trying to cram into it, is there
> a way to reduce the memory footprint or do you need to add more RAM?
>
>> any recommendations on how to pin point the "offender"?
If there is not a pre-commit hook, there is no reason to discard
the index and reread it.
This change checks to presence of a pre-commit hook and then only
discards the index if there was one.
Signed-off-by: Kevin Willford
---
builtin/commit.c | 29 +
1 file changed,
Our application (Visual Studio) needs to run git status with options
to report untracked and ignored files. It needs all untracked files
reported individually, but would rather not have all individual
ignored files under explicitly ignored directories
reported. Directories that match an ignore patt
Teach Git to optionally show ignored directories when showing all
untracked files. The git status command exposes the options to report
ignored and/or untracked files. However, when reporting all untracked
files (--untracked-files=all), all individual ignored files are reported
as well. It is not c
Jeff King writes:
> On Thu, Aug 10, 2017 at 11:28:52AM -0700, Stefan Beller wrote:
>
>> > +test_expect_success 'only trailers' '
>> > + git config trailer.sign.command "echo config-value" &&
>>
>> You may want to use 'test_config' here, which keeps the config
>> only for one test. The subs
On Thu, Aug 10, 2017 at 11:18 AM, Harry Putnam wrote:
> Stefan Beller writes:
>
>> On Thu, Aug 10, 2017 at 10:03 AM, Harry Putnam wrote:
>
> [...]
>
> Harry wrote:
>>> Here are two that are at least kind of similar but would never be seen
>>> as the same:
>>>
>>> < 192.168.1.43 m2.local.lan
String formatting can be a performance issue when there are
hundreds of thousands of trees.
Change to stop using the strbuf_addf and just add the strings
or characters individually.
There are a limited number of modes so added a switch for the
known ones and a default case if something comes thro
Jeff King writes:
> Perhaps "--exact-input" hits all of those. Or maybe "--only-input" to
> match the other "--only".
>
> I think I like that last one the best. It makes it clear that we are
> looking just at the input, and not anything else. Which is exactly what
> the feature does.
Sounds good
Jeff King writes:
>> > The above example made me wonder if we also want a format specifier
>> > to do the above without piping, but it turns out that we already
>> > have "log --format=%(trailers)", so we are good ;-)
>>
>> I was going to say, I thought we had a way to get trailers for a
>> comm
On Thu, Aug 10, 2017 at 11:35:00AM -0700, Stefan Beller wrote:
> On Thu, Aug 10, 2017 at 1:03 AM, Jeff King wrote:
> > The point of "--only-trailers" is to give a caller an output
> > that's easy for them to parse. Getting rid of the
> > non-trailer material helps, but we still may see more
> > c
On Thu, Aug 10, 2017 at 11:03 AM, Jeff King wrote:
> On Thu, Aug 10, 2017 at 04:02:46AM -0400, Jeff King wrote:
>
>> On Wed, Aug 09, 2017 at 08:21:47AM -0400, Jeff King wrote:
>>
>> > This series teaches interpret-trailers to parse and output just the
>> > trailers. So now you can do:
>> >
>> >
On Thu, Aug 10, 2017 at 1:03 AM, Jeff King wrote:
> The point of "--only-trailers" is to give a caller an output
> that's easy for them to parse. Getting rid of the
> non-trailer material helps, but we still may see more
> complicated syntax like whitespace continuation. Let's add
> an option to n
Changes since last patch:
1. Use start_progress_delay so progress isn't shown if generating
the patches is fast enough
2. Updated to have text of "Generating patches"
3. Only show progress when the --progress flag is passed
4. In the rebase script check stderr and the quiet option is not
set
When generating patches for the rebase command if the user does
not realize the branch they are rebasing onto is thousands of
commits different there is no progress indication after initial
rewinding message.
The progress meter as presented in this patch assumes the thousands of
patches to have a
This change passes the progress option of format-patch checking
that stderr is attached and rebase is not being run in quiet mode.
Signed-off-by: Kevin Willford
---
git-rebase--am.sh | 1 +
git-rebase.sh | 6 ++
2 files changed, 7 insertions(+)
diff --git a/git-rebase--am.sh b/git-rebas
On Thu, Aug 10, 2017 at 11:28:52AM -0700, Stefan Beller wrote:
> > +test_expect_success 'only trailers' '
> > + git config trailer.sign.command "echo config-value" &&
>
> You may want to use 'test_config' here, which keeps the config
> only for one test. The subsequent tests seem to overwri
On Thu, Aug 10, 2017 at 11:04 AM, Jeff King wrote:
> In theory it's easy for any reader who wants to parse
> trailers to do so. But there are a lot of subtle corner
> cases around what counts as a trailer, when the trailer
> block begins and ends, etc. Since interpret-trailers already
> has our pa
Stefan Beller writes:
> On Thu, Aug 10, 2017 at 10:03 AM, Harry Putnam wrote:
[...]
Harry wrote:
>> Here are two that are at least kind of similar but would never be seen
>> as the same:
>>
>> < 192.168.1.43 m2.local.lan m2 # 00-90-F5-A1-F9-E5
>>> 192.168.1.43m2.local.lan
From: Martin Koegler
Prevent generating delta offsets beyond 4G.
Signed-off-by: Martin Koegler
---
diff-delta.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/diff-delta.c b/diff-delta.c
index 3d5e1ef..633883e 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -454,6 +454,9 @@ create_delt
From: Martin Koegler
Signed-off-by: Martin Koegler
---
builtin/pack-objects.c | 10 +-
cache.h| 12 ++--
pack-check.c | 6 +++---
pack.h | 2 +-
sha1_file.c| 6 +++---
wrapper.c | 8
zlib.c
The last few commits have added command line options that
can turn interpret-trailers into a parsing tool. Since
they'd most often be used together, let's provide a
convenient single option for callers to invoke this mode.
This is implemented as a callback rather than a boolean so
that its effect
The point of "--only-trailers" is to give a caller an output
that's easy for them to parse. Getting rid of the
non-trailer material helps, but we still may see more
complicated syntax like whitespace continuation. Let's add
an option to normalize the output into one "key: value" line
per trailer.
We already have two options and are about to add a few more.
To avoid having a huge number of boolean arguments, let's
convert to an options struct which can be passed in.
Signed-off-by: Jeff King
---
builtin/interpret-trailers.c | 13 ++---
trailer.c| 10 ++
In theory it's easy for any reader who wants to parse
trailers to do so. But there are a lot of subtle corner
cases around what counts as a trailer, when the trailer
block begins and ends, etc. Since interpret-trailers already
has our parsing logic, let's let callers ask it to just
output the trail
It can be useful to invoke interpret-trailers for the
primary purpose of parsing existing trailers. But in that
case, we don't want to apply existing ifMissing or ifExists
rules from the config. Let's add a special mode where we
avoid applying those rules. Coupled with --only-trailers,
this gives u
On Thu, Aug 10, 2017 at 04:02:46AM -0400, Jeff King wrote:
> On Wed, Aug 09, 2017 at 08:21:47AM -0400, Jeff King wrote:
>
> > This series teaches interpret-trailers to parse and output just the
> > trailers. So now you can do:
> >
> > $ git log --format=%B -1 8d44797cc91231cd44955279040dc4a1ee
The latest maintenance release Git v2.14.1 is now available at the
usual places, together with releases for older maintenance track for
the same issue: v2.7.6, v2.8.6, v2.9.5, v2.10.4, v2.11.3, v2.12.4,
and v2.13.5.
These contain a security fix for CVE-2017-1000117, and are released
in coordinatio
On Thu, Aug 10, 2017 at 10:33 AM, Jeff King wrote:
> On Thu, Aug 10, 2017 at 10:27:19AM -0700, Stefan Beller wrote:
>
>> > I'm not fond of that, as it's vague about which exact trailers we're
>> > talking about. I also thought of something like --verbatim, but I'd
>> > worry that would seem to con
On Thu, Aug 10, 2017 at 10:03 AM, Harry Putnam wrote:
> I ran into a line in git commit ouput I had not see before
>
> #copied: d0/etc/hosts -> misc/old-readerHOSTvcs-files/etc/hosts
>
> So googling I learned that this might happen if git thinks the two
> files are the same.
>
> I was pretty
On Thu, Aug 10, 2017 at 02:36:41PM +0200, Mischa POSLAWSKY wrote:
> Jeff King wrote:
> > -#if LIBCURL_VERSION_NUM >= 0x071301
> > curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
> > -#elif LIBCURL_VERSION_NUM >= 0x071101
> > curl_easy_setopt(result, CURLOPT_POST301, 1);
>
On Thu, Aug 10, 2017 at 10:27:19AM -0700, Stefan Beller wrote:
> > I'm not fond of that, as it's vague about which exact trailers we're
> > talking about. I also thought of something like --verbatim, but I'd
> > worry that would seem to conflict with --normalize.
> >
> > I dunno. All of the names
Brandon Williams writes:
> On 08/10, Junio C Hamano wrote:
>
>> I vaguely recall that there was a discussion to have SubmitGit wait
>> for success from Travis CI; if that is already in place, then I can
>> sort of see how it would help individual contributors to have the
>> style checker in that
On Thu, Aug 10, 2017 at 12:32 AM, Jeff King wrote:
> On Wed, Aug 09, 2017 at 11:18:19AM -0700, Stefan Beller wrote:
>
>> On Wed, Aug 9, 2017 at 5:24 AM, Jeff King wrote:
>> > It can be useful to invoke interpret-trailers for the
>> > primary purpose of parsing existing trailers. But in that
>> >
On Tue, Aug 8, 2017 at 6:22 PM, Jonathan Tan wrote:
> Here is the complete patch set. I have only moved the exported functions
> that operate with packfiles and their static helpers - for example,
> static functions like freshen_packed_object() that are used only by
> non-pack-specific functions a
On 08/10, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Wed, 9 Aug 2017, Stefan Beller wrote:
> >
> >> > I am sure that something even better will be possible: a Continuous
> >> > "Integration" that fixes the coding style automatically by using
> >> > `filter-branch` (avoiding the
I ran into a line in git commit ouput I had not see before
#copied: d0/etc/hosts -> misc/old-readerHOSTvcs-files/etc/hosts
So googling I learned that this might happen if git thinks the two
files are the same.
I was pretty sure they were not the same so checked them>
diff d0/etc/host m
Get rid of a magic string length constant by using skip_prefix() instead
of starts_with().
Signed-off-by: Rene Scharfe
---
builtin/merge.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 900bafdb45..4facb6fdd0 100644
--- a/builtin/m
Johannes Schindelin writes:
> On Wed, 9 Aug 2017, Stefan Beller wrote:
>
>> > I am sure that something even better will be possible: a Continuous
>> > "Integration" that fixes the coding style automatically by using
>> > `filter-branch` (avoiding the merge conflicts that would arise if
>> > `reba
On Wed, Aug 9, 2017 at 5:54 PM, René Scharfe wrote:
> Use a NULL-and-NUL check to see if we have a prefix and consistently use
> C string functions on it instead of storing its length in a member of
> struct apply_state. This avoids strlen() calls and simplifies the code.
This looks like a good
1 - 100 of 124 matches
Mail list logo
