On 12/27/18 3:55 PM, Jonathan Nieder wrote:
> Hi,
>
> H. Peter Anvin wrote:
>
>> [merge "version"]
>> name = Version file merge driver
>> driver = sort -V -r %O %A %B | head -1 > %A.tmp.1 && mv -f %A.tmp.1
>> %A
> [...]
>> However, I can't even put this in .gitattributes, because
This changes the way HTTP response body is returned in
http_request_reauth and post_rpc.
1. http_request_reauth makes up to two requests; one without a
credential and one with a credential. The first request can fail if
it needs a credential. When the keep_error option is specified, the
r
When GIT_CURL_VERBOSE is set, libcurl produces request/response headers
to stderr. However, if the response is an error response and
CURLOPT_FAILONERROR is set, libcurl stops parsing the response, and it
won't ump the headers. Showing HTTP response headers is useful for
debugging, especially for no
Hi,
H. Peter Anvin wrote:
> [merge "version"]
> name = Version file merge driver
> driver = sort -V -r %O %A %B | head -1 > %A.tmp.1 && mv -f %A.tmp.1 %A
[...]
> However, I can't even put this in .gitattributes, because doing so would break
> any user who *doesn't* have the previo
On Thu, Dec 27, 2018 at 8:24 AM Jeff King wrote:
>
> On Wed, Dec 26, 2018 at 02:22:39PM -0800, Junio C Hamano wrote:
>
> > >> Side note: One of the secondary goals of my patch was to make it
> > >> really obvious that neither the GIT_DIR_HIT_CEILING nor the
> > >> GIT_DIR_HIT_MOUNT_POINT case can
On Thu, Dec 27, 2018 at 08:55:27PM +0100, Johannes Sixt wrote:
> Am 27.12.18 um 17:43 schrieb brian m. carlson:
> > You've got part of this. For UTF-16LE and UTF-16BE, a U+FEFF is part of
> > the text, as would a second one be if we had two at the beginning of a
> > UTF-16 or UTF-8 sequence. If som
On Thu, Dec 27 2018, Randall S. Becker wrote:
> On December 27, 2018 17:40, Ævar Arnfjörð Bjarmason wrote:
>> On Wed, Dec 26 2018, Randall S. Becker wrote:
>>
>> > Please stay tuned for patches. We are very much looking forward to
>> > having the two (or three) different NonStop hardware persona
setup_git_directory_gently() expects two types of failures to
discover a git directory (e.g. .git/):
- GIT_DIR_HIT_CEILING: could not find a git directory in any
parent directories of the cwd.
- GIT_DIR_HIT_MOUNT_POINT: could not find a git directory in
any parent directories u
On December 27, 2018 17:40, Ævar Arnfjörð Bjarmason wrote:
> On Wed, Dec 26 2018, Randall S. Becker wrote:
>
> > Please stay tuned for patches. We are very much looking forward to
> > having the two (or three) different NonStop hardware personalities
> > supported without mods in the very near fut
On Wed, Dec 26 2018, Randall S. Becker wrote:
> Please stay tuned for patches. We are very much looking forward to having
> the two (or three) different NonStop hardware personalities supported
> without mods in the very near future. Our goal, assuming those patches are
> acceptable, is to move
From: "Randall S. Becker"
A number of configuration options are not automatically detected by
configure mechanisms, including the location of Perl and Python.
There was a problem at a specific set of operating system versions
that caused getopt to have compile errors. Account for this by
providi
Hi Junio,
On Wed, 26 Dec 2018, Junio C Hamano wrote:
> Paul-Sebastian Ungureanu writes:
>
> > +static void set_env_if(const char *key, const char *value, int *given, int
> > bit)
> > +{
> > + if ((*given & bit) || getenv(key))
> > + return; /* nothing to do */
> > + setenv(key, v
On Thu, Dec 27, 2018 at 10:56 AM Nguyễn Thái Ngọc Duy wrote:
> Do not handle prefix directly. It's simpler to use OPT_FILENAME()
> instead. The othe reason for doing this is because this code (where
s/othe/other/
> the deleted code is) will be factored out and called when "prefix" is
> not avail
On Thu, Dec 27, 2018 at 10:56 AM Nguyễn Thái Ngọc Duy wrote:
> "git config --worktree" can write to the write file whether
s/write file/right file/
> extensions.worktreeConfig is enabled or not. In order to do the same
> using config API, we need to determine the right file to write to. Add
> th
On Thu, Dec 27, 2018 at 11:26 AM Nguyễn Thái Ngọc Duy wrote:
> While at there, move exit() back to the caller. It's easier to see the
> flow that way then burying it in diff-no-index.c
s/then/than/
> Signed-off-by: Nguyễn Thái Ngọc Duy
The current definition for merge drivers require the output file %A to be
overwritten. When using a pipeline of Unix commands, this often results in %A
being truncated too early, requiring the user to add a temporary file managed
explicitly.
It would be far preferable if git could manage this; per
Right now, merge rules can get selected in .gitattributes, which is
version-controlled. However, there does not appear to be any way to *define*
custom merge rules which is version controlled.
There are a lot of different files which can benefit from custom merge rules,
especially ones that are in
On Thu, Dec 27, 2018 at 1:35 PM wrote:
> A number of configuration options are not automatically detected by
> configure mechanisms, including the location of Perl and Python.
>
> There was a problem at a specific set of operating system versions
> that caused getopt to have compile errors. Accoun
Am 27.12.18 um 17:43 schrieb brian m. carlson:
On Thu, Dec 27, 2018 at 11:06:17AM +0100, Johannes Sixt wrote:
It worries me that theoretical correctness is regarded higher than existing
practice. I do not care a lot what some RFC tells what programs should do if
the majority of the software does
+cc: Masaya Suzuki
In October, Thomas Gummerer wrote:
> On 10/12, Jonathan Nieder wrote:
>> Jeff King wrote:
>>> On Fri, Oct 12, 2018 at 07:40:37PM +0100, Thomas Gummerer wrote:
801fa63a90 ("config.mak.dev: add -Wformat-security", 2018-09-08) added
the -Wformat-security to the flags set
On Thu, Dec 27, 2018 at 10:36 AM Duy Nguyen wrote:
>
> On Thu, Dec 27, 2018 at 7:18 PM Masaya Suzuki wrote:
> >
> > Without -Wformat, -Wformat-security won't work.
> >
> > > cc1: error: -Wformat-security ignored without -Wformat
> > > [-Werror=format-security]
>
> Compiler name and version?
I'm
On Thu, Dec 27, 2018 at 7:18 PM Masaya Suzuki wrote:
>
> Without -Wformat, -Wformat-security won't work.
>
> > cc1: error: -Wformat-security ignored without -Wformat
> > [-Werror=format-security]
Compiler name and version?
>
> Signed-off-by: Masaya Suzuki
> ---
> config.mak.dev | 1 +
> 1 fil
From: "Randall S. Becker"
A number of configuration options are not automatically detected by
configure mechanisms, including the location of Perl and Python.
There was a problem at a specific set of operating system versions
that caused getopt to have compile errors. Accounted for this by
provi
Initialization in OpenSSL has been deprecated in version 1.1. This makes
compilation fail when deprecated APIs for OpenSSL are compile-time
disabled.
Signed-off-by: Rosen Penev
---
imap-send.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/imap-send.c b/imap-send.c
index b4eb886e2..877a4e
On Wed, Dec 26, 2018 at 10:32 PM Junio C Hamano wrote:
>
> Rosen Penev writes:
>
> > Initialization in OpenSSL has been deprecated in version 1.1.
>
> https://www.openssl.org/docs/man1.0.2/ssl/SSL_library_init.html says
>
> SSL_library_init() must be called before any other action takes
>
On December 27, 2018 12:03, Eric Sunshine wrote:
> On Wed, Dec 26, 2018 at 6:05 PM wrote:
> > A number of configuration options are not automatically detected by
> > configure mechanisms, including the location of Perl and Python.
> > [...]
> > Signed-off-by: Randall S. Becker
> > ---
> > diff --
Hi,
Ævar Arnfjörð Bjarmason wrote:
> On Wed, Dec 26 2018, Junio C Hamano wrote:
>> Hmph. The other overzealous thing you could do is to strenthen A
>> and "fix" the security issue in v2? Which letter comes before A in
>> the alphabet? ;-)
Yes, agreed. This is what I was hinting at in [1] with
On Wed, Dec 26, 2018 at 6:05 PM wrote:
> A number of configuration options are not automatically detected by
> configure mechanisms, including the location of Perl and Python.
> [...]
> Signed-off-by: Randall S. Becker
> ---
> diff --git a/config.mak.uname b/config.mak.uname
> @@ -441,26 +441,45
hi,
git developers. I found a bug when i want to convert webkit to git
there are some branch named safari... in webkit svn repo.
when i want to convert them to branch in git. a problem happen.
if you want to reproduce the problem, just follow the guide below.
1. git svn clone -s htt
On Thu, Dec 27, 2018 at 11:06:17AM +0100, Johannes Sixt wrote:
> It worries me that theoretical correctness is regarded higher than existing
> practice. I do not care a lot what some RFC tells what programs should do if
> the majority of the software does something different and that behavior has
>
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.h | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/diff.h b/diff.h
index 9e8061ca29..4b65ff739f 100644
--- a/diff.h
+++ b/diff.h
@@ -9,16 +9,16 @@
#include "object.h"
#include "oidset.h"
-struct rev_info;
+struct com
This is a preparation step to start using parse_options() to parse
diff/revision options instead of what we have now. There are a couple
of good things from using parse_options():
- better help usage
- easier to add new options
- better completion support
- help usage generation
- better integrati
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index a866f13c76..59132ceaff 100644
--- a/diff.c
+++ b/diff.c
@@ -4868,6 +4868,13 @@ static int parse_objfind_opt(struct diff_options *opt,
const char *ar
Diff's internal option parsing is now done with 'struct option', which
makes it possible to combine all diff options to range-diff and parse
everything all at once. Parsing code becomes simpler, and we get a
looong 'git range-diff -h'
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/range-diff.c
Bitfield addresses cannot be passed around in a pointer. This makes it
hard to use parse-options to set/unset them. Turn this struct to
normal integers. This of course increases the size of this struct
multiple times, but since we only have a handful of diff_options
variables around, memory consump
diff_opt_parse() is a heavy hammer to just set diff filter. But it's
the only way because of the diff_status_letters[] mapping. Add a new
API to set diff filter and use it in git-am. diff_opt_parse()'s only
remaining call site in revision.c will be gone soon and having it here
just because of git-a
While at there, move exit() back to the caller. It's easier to see the
flow that way then burying it in diff-no-index.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/diff.c | 21 +++--
diff-no-index.c | 49
diff.h
OPTION_CALLBACK is much simpler/safer to use, but parse_opt_cb does
not allow access to parse_opt_ctx_t, which sometimes is useful
(e.g. to obtain the prefix).
Extending parse_opt_cb to take parse_opt_cb could result in a lot of
changes. Instead let's just allow ll_callback to be used with
OPTION_
Signed-off-by: Nguyễn Thái Ngọc Duy
---
parse-options.h | 60 -
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/parse-options.h b/parse-options.h
index a650a7d220..1947cb27cf 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -174
These two are orthogonal. One is about unknown _option_ while the
other non-option.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
parse-options.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index d47e217b07..4cbcefc262 100644
--- a/parse-options.c
+++ b/pars
parse-options can unambiguously find an abbreviation only if it sees
all available options. This is usually the case when you use
parse_options(). But there are other callers like blame or shortlog
which uses parse_options_start() in combination with a custom option
parser, like rev-list. parse-opt
This is needed for diff_opt_parse() where we do
value = (value & ~mask) | some_more;
Signed-off-by: Nguyễn Thái Ngọc Duy
---
parse-options.c | 7 +++
parse-options.h | 5 +
2 files changed, 12 insertions(+)
diff --git a/parse-options.c b/parse-options.c
index 81e66b9374..9e19d64cc9
This is to help reimplement diff_opt_parse() using parse_options().
The behavior of parse_options() is changed to be the same as the
other:
- no argv0 in argv[], everything can be processed
- argv[] must not be updated, it's the caller's job to do that
- return the number of arguments processed
-
This is a sneak peek of converting diff_opt_parse() to 'struct
option'. The end game is builtin commands can just add diff options to
their 'struct option[]' array, do parse_options() like usual and have
diff parsing for free.
Besides simplifying the parsing code, there are also more benefits of
u
Give names to these magic negative numbers. Make parse_opt_ll_cb
return an enum to make clear it can actually control parse_options()
with different return values (parse_opt_cb can too, but nobody needs
it).
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/merge.c| 5 +--
builtin/update-
Lowlevel callbacks have different function signatures. Add a new field
in 'struct option' with the right type for lowlevel callbacks.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/blame.c| 2 +-
builtin/merge.c| 2 +-
builtin/update-index.c | 11 ++-
parse-options-cb.
On Wed, Dec 26, 2018 at 02:22:39PM -0800, Junio C Hamano wrote:
> >> Side note: One of the secondary goals of my patch was to make it
> >> really obvious that neither the GIT_DIR_HIT_CEILING nor the
> >> GIT_DIR_HIT_MOUNT_POINT case can get us into the block protected by
> >> (startup_info->have_r
On December 27, 2018 7:13, Derrick Stolee:
> On 12/26/2018 6:05 PM, randall.s.bec...@rogers.com wrote:
> > From: "Randall S. Becker"
> >
> > This set of patches is a distilled version of the minimal set of
> > changes to git that will allow it to run as client and server on HPE
> > NonStop NSE and
From: "Randall S. Becker"
The HPE NonStop (a.k.a. __TANDEM) platform cannot build git without
using the FLOSS package supplied by HPE. The convenient location
for including the relevant headers is in this file.
The NSIG define is also not defined on __TANDEM, so we define it
here as 100 if it is
This is C equivalent of "git config --set --worktree". In other words,
it will
- write to $GIT_DIR/config in single-worktree setup
- write to $GIT_COMMON_DIR/worktrees//config.worktree or
$GIT_COMMON_DIR/config.worktree (for main worktree)
if extensions.worktreeConfig is enabled
- return err
"git config --worktree" can write to the write file whether
extensions.worktreeConfig is enabled or not. In order to do the same
using config API, we need to determine the right file to write to. Add
this function for that purpose. This is the basis for the coming
repo_config_set_worktree()
Signed
This is a continuation of nd/per-worktree-config, fixing is small
things from that series and prepares to make submodules work in
multiple worktrees.
The first thing is adding API for updating per-worktree config in
03/06. When submodule code wants to write to a per-worktree config,
calling this f
This option can be used to move one or multiple variables from one
place to another, e.g. to move some aliases from repo config to user
config, or from repo config to per-worktree config.
This will be useful for moving config variables around when
extensions.worktreeConfig is enabled. E.g.
gi
Do not handle prefix directly. It's simpler to use OPT_FILENAME()
instead. The othe reason for doing this is because this code (where
the deleted code is) will be factored out and called when "prefix" is
not available.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/config.c | 6 +-
1 file c
This function has both $GIT_COMMON_DIR and $GIT_DIR in "opts". Use it
to construct config.worktree path instead because git_pathdup() is
tied to the current worktree, but the given $GIT_DIR could be from
another one.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
config.c | 14 --
1 file ch
In the next patch, "config" is taught to move some config variables
from one file to another. We need to specify two locations, source and
destination, and the plan is reusing the same --global/--local/...
option. Factor this code out for reuse later.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
buil
On December 27, 2018 7:10, Derrick Stolee wrote:
> On 12/26/2018 6:05 PM, randall.s.bec...@rogers.com wrote:
> > The NSIG define is also not defined on __TANDEM, so we define it here
> > as 100 if it is not defined only for __TANDEM builds.
> [snip]
> > +#if ! defined NSIG
>
> Why didn't you use "
On Wed, Dec 26, 2018 at 06:52:56PM -0800, Alexandre Grigoriev wrote:
>
> > -Original Message-
> > From: brian m. carlson [mailto:sand...@crustytoothpaste.net]
> > Sent: Wednesday, December 26, 2018 11:25 AM
> > To: Alexandre Grigoriev
> > Cc: 'Torsten Bögershausen'; 'Adrián Gimeno Balaguer
On 12/14/2018 7:09 PM, Stefan Beller wrote:
I realized next has not been rewound, so I can resend sb/more-repo-in-api,
which I hereby do. The changes are minimal and address the only comment
by Jonathan so far.
Sorry I'm very late to look at this, but your series looks good to me.
I've got som
On 12/19/2018 3:33 AM, issac.tro...@gmail.com wrote:
From: Issac Trotts
Make it possible to write for example
git log --format="%H,%S"
where the %S at the end is a new placeholder that prints out the ref
(tag/branch) for each commit.
Using %d might seem like an alternative but it on
On 12/26/2018 6:05 PM, randall.s.bec...@rogers.com wrote:
From: "Randall S. Becker"
This set of patches is a distilled version of the minimal
set of changes to git that will allow it to run as client
and server on HPE NonStop NSE and NSX systems. NSR systems
are no longer under support so refer
On 12/26/2018 6:05 PM, randall.s.bec...@rogers.com wrote:
The NSIG define is also not defined on __TANDEM, so we define it
here as 100 if it is not defined only for __TANDEM builds.
[snip]
+#if ! defined NSIG
Why didn't you use "#ifndef" here?
Taking a look at the file, I see both "#ifdef" a
On Wed, Dec 26 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> The genreal ways I see forward from that are:
>>
>> A) Say that v2 has a security issue and that this is a feature that
>> works in some circumstances, but given Jeff's explanation here we
>> should at le
Am 27.12.18 um 03:17 schrieb brian m. carlson:
We've recently fielded several reports from unhappy Windows users about
our handling of UTF-16, UTF-16LE, and UTF-16BE, none of which seem to be
suitable for certain Windows programs.
In an effort to communicate the reasons for our behavior more
eff
64 matches
Mail list logo
