In line with how difftool accepts a -g/--[no-]gui option, make mergetool
accept the same option in order to use the `merge.guitool` variable to
find the default mergetool instead of `merge.tool`.
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Denton Liu
Signed-off-by: Anmol Mago
Signed-off-by: Brian Ho
Signed-off-by: David Lu
Signed-off-by: Ryan Wang
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/complet
Signed-off-by: Denton Liu
---
Documentation/diff-config.txt | 8
Documentation/merge-config.txt | 6 ++
2 files changed, 14 insertions(+)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 85bca83c3..e64d983c3 100644
--- a/Documentation/diff-config.txt
This is a resend of patchset v3 where we add another patch on top of the
existing patchset in order to document the guitool keys for `git
config`. This way, the completions script will now be able to complete
these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
Junio C Hamano writes:
>
> Sebastian Staudt writes:
>
> > Travis CI will soon deprecate the container-based infrastructure
> > enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753.
> >
> > More info:
> > https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures
>
> Tha
Johannes Schindelin writes:
>> I did not and I do not think it would. I was wondering if the
>> ability to be able to specify these per destination is something
>> very useful and deserves to be called out in the doc, together with
>> ...
>
> I do not think that it needs to be called out specifi
Johannes Schindelin writes:
> On Thu, 25 Oct 2018, Junio C Hamano wrote:
>
>> When a requested feature cannot be activated because the version of
>> cURL library used to build Git with is too old, most of the codepaths
>> give a warning like "$Feature is not supported with cURL < $Version",
>> ma
On Thu, Oct 25, 2018 at 2:09 PM Ramsay Jones
wrote:
> Yes, this will 'fix' the 'commit-reach.h' header (not surprising),
> but I prefer my patch. ;-)
I apologize, I joined the list recently and so might had missed a
reroll; the merged series in pu doesn't seem to include it and the
error was arou
tbo...@web.de writes:
> From: Torsten Bögershausen
> Subject: Re: [PATCH v1 2/2] curl_off_t xcurl_off_t is not portable
That title is misleading; it sounded as if the are these two
typedefs and they do not work correctly on some platforms, but that
is not what you are doing with the patch.
> C
Stefan Beller writes:
>> In this series I am addressing the comments by Stefan Beller about the
>> tests in patch 9.
>>
>> If the new tests look OK, I'd say we try moving the series to "next" and
>> see what happens?
>
> Sounds good to me.
Which means (1) the plan sounds OK but I didn't look at
Eric Sunshine writes:
>> + test_when_finished "
>> + git checkout branch-one
>> + git branch -D branch-and-tag-name
>> + " &&
>> + git checkout -b branch-and-tag-name &&
>> + test_when_finished "git tag -d branch-and-tag-name" &&
>> + git
On Fri, Oct 26, 2018 at 09:09:48AM +0900, Junio C Hamano wrote:
> Sebastian Staudt writes:
>
> > Travis CI will soon deprecate the container-based infrastructure
> > enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753.
> >
> > More info:
> > https://blog.travis-ci.com/2018-10-04-
Johannes Sixt writes:
> The sequencer instruction 'b', short for 'break', is rejected:
>
> error: invalid line 2: b
>
> The reason is that the parser expects all short commands to have
> an argument. Permit short commands without arguments.
>
> Signed-off-by: Johannes Sixt
> ---
> I'll send a
Jeff King writes:
> On Thu, Oct 25, 2018 at 01:32:14PM -0700, stead...@google.com wrote:
>
>> Initialize archivers as soon as possible when running git-archive.
>> Various non-obvious behavior depends on having the archivers
>> initialized, such as determining the desired archival format from the
Slavica Djukic writes:
> From: Slavica
Please make sure this matches your sign-off below.
> This is part of enhancement request that ask for 'git stash' to work
> even if 'user.name' and 'user.email' are not configured.
> Due to an implementation detail, git-stash undesirably requires
> 'user.
Eric Sunshine writes:
>> + test_when_finished "git tag -d branch-and-tag-name" &&
>> + git tag branch-and-tag-name &&
>
> If git-tag crashes before actually creating the new tag, then "git tag
> -d", passed to test_when_finished(), will error out too, which is
> probably undesirable s
"Jansen, Geert" writes:
> The index-pack command determines if a sha1 collision test is needed by
> checking the existence of a loose object with the given hash. In my tests, I
> can improve performance of “git clone” on Amazon EFS by 8x when used with a
> non-default mount option (lookupcache=po
Sebastian Staudt writes:
> Travis CI will soon deprecate the container-based infrastructure
> enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753.
>
> More info:
> https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures
Thanks for posting a patch that would serve a
When a command is invoked with both --exclude-promisor-objects,
--objects-edge-aggressive, and a missing object on the command line,
the rev_info.cmdline array could get a NULL pointer for the value of
an 'item' field. Prevent dereferencing of a NULL pointer in that
situation.
There are a few othe
Jeff King writes:
> An easy test is:
>
> $ git rev-list --no-walk --exclude='*' --all --all
> 3289ca716320457af5d2dd550b716282ad22da11
> ...a bunch of other tip commits...
>
> $ git rev-parse --exclude='*' --all --all
> [no output, but it should print those same tip commits]
I actually
Gerrit, the code review tool, has a different workflow than our mailing
list based approach. Usually users upload changes to a Gerrit server and
continuous integration and testing happens by bots. Sometimes however a
user wants to checkout a change locally and look at it locally. For this
use case,
Currently when git-fetch is asked to recurse into submodules, it dispatches
a plain "git-fetch -C " (with some submodule related options
such as prefix and recusing strategy, but) without any information of the
remote or the tip that should be fetched.
But this default fetch is not sufficient, as
Keep the properties introduced in 10f5c52656 (submodule: avoid
auto-discovery in prepare_submodule_repo_env(), 2016-09-01), by fixating
the git directory of the submodule.
Signed-off-by: Stefan Beller
---
submodule.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a
We used to recurse into submodules, even if they were broken having
only an objects directory. The child process executed in the submodule
would fail though if the submodule was broken.
This patch tightens the check upfront, such that we do not need
to spawn a child process to find out if the subm
'calculate_changed_submodule_paths' uses a local list to compute the
changed submodules, and then produces the result by copying appropriate
items into the result list.
Instead use the result list directly and prune items afterwards
using string_list_remove_empty_items.
By doing so we'll have acc
When constructing a struct repository for a submodule for some revision
of the superproject where the submodule is not contained in the index,
it may not be present in the working tree currently either. In that
situation giving a 'path' argument is not useful. Upgrade the
repo_submodule_init functi
We can string_list_insert() to maintain sorted-ness of the
list as we find new items, or we can string_list_append() to
build an unsorted list and sort it at the end just once.
As we do not rely on the sortedness while building the
list, we pick the "append and sort at the end" as it
has better wo
The `changed_submodule_names` are only used for fetching, so let's make it
part of the struct that is passed around for fetching submodules.
Signed-off-by: Stefan Beller
---
submodule.c | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/submodule.c b/submodu
The submodule subsystem is really bad at staying within 80 characters.
Fix it while we are here.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
submodule.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/submodule.c b/submodule.c
index 2b7082b2db..e1
Thanks Jonathan for your thoughtful comments,
here is the product of the discussion:
* I split up the patch to fetch in the worktree to be 2 patches,
each giving motivation on its own.
* the last patch is vastly simplified in code, but takes an extra test
* in [1], you remark "commits" ought not
Helped-by: Junio C Hamano
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
Documentation/technical/api-oid-array.txt | 5 +
sha1-array.c | 17 +
sha1-array.h | 3 +++
3 files changed, 25 insertions(+)
On Tue, Oct 23, 2018 at 9:54 PM Junio C Hamano wrote:
>
> Matthew DeVore writes:
>
> > No code which reads cmdline in struct rev_info can handle NULL objects
> > in cmdline.rev[i].item, so stop adding them to the cmdline.rev array.
>
> "The code is not prepared to have cmdline.rev[].item that is
On 2018.10.24 10:50, Johannes Schindelin wrote:
> Maybe a lot of explanation, but definitely a good one. The explanation and
> the patch look good to me.
>
> Thanks,
> Dscho
Agreed, as a newbie I definitely appreciate detailed explanations. Looks
good to me as well.
Reviewed-by: Josh Steadmon
All,
I recently needed to extract the git history of a portion of an existing
repository. My initial attempts using --subdirectory-filter, subtrees,
etc weren't as successful as I'd hoped.
The primary reason for my failures were due to the fact that this
particular source repository has seen a l
On Tue, Oct 23, 2018 at 4:38 PM Jonathan Tan wrote:
>
> > > Another thing you need to clarify is what happens if the fetch-by-commit
> > > fails. Right now, it seems that it will make the whole thing fail, which
> > > might be a surprising change in behavior.
> >
> > But a positive surprise, I wou
On Thu, Oct 25, 2018 at 02:24:41AM +0100, Ramsay Jones wrote:
> >> Yeah, my thinko. The latter would be closer to what this patch
> >> wants to have, but obviously the former would be more flexible and
> >> useful in wider context. Both have the "Huh?" factor---what they
> >> are doing has littl
On Thu, Oct 25 2018, SZEDER Gábor wrote:
> when branch 'ds/test-multi-pack-index' is merged with
> 'ab/commit-graph-progress', IOW 'master', 'next', or 'pu',
> 'GIT_TEST_MULTI_PACK_INDEX=1 ./t6500-gc.sh' fails with:
>
> expecting success:
> git -c gc.writeCommitGraph=true gc --no-qui
On Thu, Oct 25, 2018 at 01:32:14PM -0700, stead...@google.com wrote:
> Initialize archivers as soon as possible when running git-archive.
> Various non-obvious behavior depends on having the archivers
> initialized, such as determining the desired archival format from the
> provided filename.
>
>
On 25/10/2018 19:54, Ramsay Jones wrote:
>
>
> On 25/10/2018 12:04, Carlo Marcelo Arenas Belón wrote:
>> struct commmit needs to be defined before commit-slab can generate
>> working code, object_id should be at least known through a forward
>> declaration
>>
>> Signed-off-by: Carlo Marcelo Ar
Am 25.10.18 um 22:54 schrieb Johannes Sixt:
Test each short command at least once. The commands changed here
are chosen such that
- tests do not have a prerequisite,
- the 'git rebase' command is not guarded by test_must_fail.
The pick commands are optional noise words in the FAKE_LINES
variabl
Test each short command at least once. The commands changed here
are chosen such that
- tests do not have a prerequisite,
- the 'git rebase' command is not guarded by test_must_fail.
The pick commands are optional noise words in the FAKE_LINES
variable. Test them, too.
Signed-off-by: Johannes Si
The sequencer instruction 'b', short for 'break', is rejected:
error: invalid line 2: b
The reason is that the parser expects all short commands to have
an argument. Permit short commands without arguments.
Signed-off-by: Johannes Sixt
---
I'll send a another patch in a moment that tests all
Initialize archivers as soon as possible when running git-archive.
Various non-obvious behavior depends on having the archivers
initialized, such as determining the desired archival format from the
provided filename.
Since 08716b3c11 ("archive: refactor file extension format-guessing",
2011-06-21)
On 2018.10.23 13:09, Junio C Hamano wrote:
> stead...@google.com writes:
>
> > diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
> > index 2a97b27b0a..cfd5ca492f 100755
> > --- a/t/t5000-tar-tree.sh
> > +++ b/t/t5000-tar-tree.sh
> > @@ -39,6 +39,8 @@ test_lazy_prereq TAR_NEEDS_PAX_FALLBACK '
On Thu, Oct 25, 2018 at 3:04 PM Daniels Umanovskis
wrote:
> When called with --show-current, git branch will print the current
> branch name and terminate. Only the actual name gets printed,
> without refs/heads. In detached HEAD state, nothing is output.
>
> Signed-off-by: Daniels Umanovskis
> -
On Wed, Oct 24, 2018 at 6:59 PM SZEDER Gábor wrote:
>
> On Mon, Oct 22, 2018 at 11:54:06AM -0700, Stefan Beller wrote:
>
> > For the sake of a good history, I would think running 'make coccicheck'
> > and applying the resulting patches would be best as part of the (dirty)
> > merge of any topic th
From: Slavica
This is part of enhancement request that ask for 'git stash' to work
even if 'user.name' and 'user.email' are not configured.
Due to an implementation detail, git-stash undesirably requires
'user.name' and 'user.email' to be set, but shouldn't.
The issue is discussed here:
https://p
Changes since v1:
*changed:
test_must_fail git config user.email
to:
test_unconfig user.email &&
test_unconfig user.name
This is done to make sure that user.email and user.name are not set,
instead of asserting it with test_must_fail
On Thu, Oct 25, 2018 at 1:47 AM Nickolai Belakovski
wrote:
> The motivation for the change is some work that I'm doing to add a
> worktree atom in ref-filter.c. I wanted that atom to be able to access
> all fields of the worktree struct and noticed that lock_reason wasn't
> getting populated so I
When called with --show-current, git branch will print the current
branch name and terminate. Only the actual name gets printed,
without refs/heads. In detached HEAD state, nothing is output.
Intended both for scripting and interactive/informative use.
Unlike git branch --list, no filtering is nee
Hi Junio,
On Thu, 25 Oct 2018, Junio C Hamano wrote:
> When a requested feature cannot be activated because the version of
> cURL library used to build Git with is too old, most of the codepaths
> give a warning like "$Feature is not supported with cURL < $Version",
> marked for l10n. A few of t
> On Wed, 24 Oct 2018, Johannes Schindelin wrote:
>
> > On Wed, 24 Oct 2018, Junio C Hamano wrote:
> >
> > > Jonathan, do you see any issues with the use of lookup_commit() in
> > > this change wrt lazy clone? I am wondering what happens when the
> > > commit in question is at, an immediate pare
On 25/10/2018 12:04, Carlo Marcelo Arenas Belón wrote:
> struct commmit needs to be defined before commit-slab can generate
> working code, object_id should be at least known through a forward
> declaration
>
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
> commit-slab-impl.h | 2 ++
> com
From: Johannes Schindelin
As of cURL v7.60.0, the Secure Channel backend can use the certificate
bundle provided via `http.sslCAInfo`, but that would override the
Windows Certificate Store. Since this is not desirable by default, let's
tell Git to not ask cURL to use that bundle by default when t
From: Brendan Forster
This adds support for a new http.schannelCheckRevoke config value.
This config value is only used if http.sslBackend is set to "schannel",
which forces cURL to use the Windows Certificate Store when validating
server certificates associated with a remote server.
This confi
From: Johannes Schindelin
As of version 7.56.0, curl supports being compiled with multiple SSL
backends.
This patch adds the Git side of that feature: by setting http.sslBackend
to "openssl" or "schannel", Git for Windows can now choose the SSL
backend at runtime.
This comes in handy on Windows
This topic branch brings support for choosing cURL's SSL backend (a feature
developed in Git for Windows' context) at runtime via http.sslBackend, and
two more patches that are related (and only of interest for Windows users).
Changes since v1:
* Reworded the commit message of v1's patch 2/3, to
Hi Junio,
On Thu, 18 Oct 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> In any case, you can use "http..$variable" to say "I want the
> >> http.$variable to be in effect but only when I am talking to ".
> >> Does it make sense for this new variable, too? That is, does it
> >>
> In this series I am addressing the comments by Stefan Beller about the
> tests in patch 9.
>
> If the new tests look OK, I'd say we try moving the series to "next" and
> see what happens?
Sounds good to me.
Thanks,
Stefan
The index-pack command determines if a sha1 collision test is needed by
checking the existence of a loose object with the given hash. In my tests, I
can improve performance of “git clone” on Amazon EFS by 8x when used with a
non-default mount option (lookupcache=pos) that's required for a Gitlab HA
On Thu, Oct 25, 2018 at 2:04 AM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > Jonathan Tan writes:
> >
> >> +GIT_TRACE_PACKET="$(pwd)/log" test_must_fail git -C http_child \
> >> +-c protocol.version=2 \
> >> +fetch "$HTTPD_URL/one_time_sed/http_parent" 2> er
On Thu, Oct 25, 2018 at 11:03 AM Michael Forney wrote:
>
> On 2018-03-16, Michael Forney wrote:
> > Hi,
> >
> > In the past few months have noticed some confusing behavior with
> > ignored submodules. I finally got around to bisecting this to commit
> > 5556808690ea245708fb80383be5c1afee2fb3eb (a
On 2018-03-16, Michael Forney wrote:
> Hi,
>
> In the past few months have noticed some confusing behavior with
> ignored submodules. I finally got around to bisecting this to commit
> 5556808690ea245708fb80383be5c1afee2fb3eb (add, reset: ensure
> submodules can be added or reset).
>
> Here is a d
Travis CI will soon deprecate the container-based infrastructure
enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753.
More info:
https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures
Signed-off-by: Sebastian Staudt
---
.travis.yml | 2 --
1 file changed, 2 delet
On 25/10/2018 10:26, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> To be honest, I find the second sentence in your rewrite even more
>> confusing. It reads as if `reset.quiet` configuration variable
>> can be used to restore the "show what is yet to be added"
>> behaviour, due to the
Tests 5 and 6 check for the effects of the same commit, merge the two
tests to make it more straightforward to clean things up after the test
has finished.
The cleanup will be added in a future commit.
Signed-off-by: Antonio Ospite
---
t/t7411-submodule-config.sh | 18 +-
1 file
Add a test tool to exercise config_from_gitmodules(), in particular for
the case of nested submodules.
Add also a test to document that reading the submoudles config of nested
submodules does not work yet when the .gitmodules file is not in the
working tree but it still in the index.
This is beca
Introduce a new config_set_in_gitmodules_file_gently() function to write
config values to the .gitmodules file.
This is in preparation for a future change which will use the function
to write to the .gitmodules file in a more controlled way instead of
using "git config -f .gitmodules".
The purpos
Use the 'submodule--helper config' command in git-submodules.sh to avoid
referring explicitly to .gitmodules by the hardcoded file path.
This makes it possible to access the submodules configuration in a more
controlled way.
Signed-off-by: Antonio Ospite
---
git-submodule.sh | 8
1 fil
Introduce a helper function named is_writing_gitmodules_ok() to verify
that the .gitmodules file is safe to write.
The function name follows the scheme of is_staging_gitmodules_ok().
The two symbolic constants GITMODULES_INDEX and GITMODULES_HEAD are used
to get help from the C preprocessor in pr
Add a new print_config_from_gitmodules() helper function to print values
from .gitmodules just like "git config -f .gitmodules" would.
This will be used by a new submodule--helper subcommand to be able to
access the .gitmodules file in a more controlled way.
Signed-off-by: Antonio Ospite
---
su
In t/t7506-status-submodule.sh at some point a new scenario is set up to
test different things, in particular new submodules are added which are
meant to completely replace the previous ones.
However before calling the "git submodule add" commands for the new
layout, the .gitmodules file is remove
Tests 5 and 7 in t/t7411-submodule-config.sh add two commits with
invalid lines in .gitmodules but then only the second commit is removed.
This may affect future subsequent tests if they assume that the
.gitmodules file has no errors.
Remove both the commits as soon as they are not needed anymore
Hi,
this series teaches git to try and read the .gitmodules file from the
index (:.gitmodules) or from the current branch (HEAD:.gitmodules) when
the file is not readily available in the working tree.
This can be used, together with sparse checkouts, to enable submodule
usage with programs like v
When the .gitmodules file is not available in the working tree, try
using the content from the index and from the current branch. This
covers the case when the file is part of the repository but for some
reason it is not checked out, for example because of a sparse checkout.
This makes it possible
Add a new 'config' subcommand to 'submodule--helper', this extra level
of indirection makes it possible to add some flexibility to how the
submodules configuration is handled.
Signed-off-by: Antonio Ospite
---
builtin/submodule--helper.c | 14 ++
t/t7411-submodule-config.sh | 27
From: Torsten Bögershausen
If a "char" in C is signed or unsigned is not specified, because it is
out of tradition "implementation dependent".
Therefore constructs like "if (name[i] < 0)" are not portable,
use "if (name[i] & 0x80)" instead.
Detected by "gcc (Raspbian 6.3.0-18+rpi1+deb9u1) 6.3.0
From: Torsten Bögershausen
Comparing signed and unsigned values is not always portable.
When setting
DEVELOPER = 1
DEVOPTS = extra-all
"gcc (Raspbian 6.3.0-18+rpi1+deb9u1) 6.3.0 20170516" errors out with
"comparison is always false due to limited range of data type"
"[-Werror=type-limits]"
Sol
On the newest version of Git available via Homebrew (2.19.1), when the
gui tool needs to repaint the screen (refresh a file, change a focused
file, stage files) the window that is repainted flashes a dark gray
before returning to white. This was not occurring on High Sierra
yesterday, but has occur
I noticed that the piped output still prints the (HEAD -> ) :
git log --pretty=format:"%d*%B" --decorate-refs='refs/tags/*'
*bar
(tag: "123")*foo
git log --pretty=format:"%d*%B" --decorate-refs='refs/tags/*' > tmp.tmp
(HEAD -> branch)*bar
(tag: "123")*foo
I would expect the output that
Hi all,
On 10/25/18 1:37 AM, Junio C Hamano wrote:
> "lhf...@163.com" writes:
>
>> I have a good idea, add a file to git that is the opposite of .gitignore...,
> Do negative patterns in .gitignore file help without inventing
> anything new?
I did this several years ago in an attempt to track /et
Upstream status should be spaced even if other statuses don't exist
for consistency of view. Eg: if a repository is freshly cloned, the
prompt shows "(master=)" but with an additional status like a change,
it'll show "(master *=)". Now it'll show "(master =)" and accounts for
other states as well.
On 10/25/2018 5:26 AM, Junio C Hamano wrote:
Junio C Hamano writes:
To be honest, I find the second sentence in your rewrite even more
confusing. It reads as if `reset.quiet` configuration variable
can be used to restore the "show what is yet to be added"
behaviour, due to the parenthetica
On Thu, 25 Oct 2018 17:40:47 +0900
Junio C Hamano wrote:
> Antonio Ospite writes:
>
> > this series teaches git to try and read the .gitmodules file from the
> > index (:.gitmodules) or from the current branch (HEAD:.gitmodules) when
> > the file is not readily available in the working tree.
>
On 10/25/2018 5:43 AM, Jeff King wrote:
On Thu, Oct 11, 2018 at 12:21:44PM -0400, Derrick Stolee wrote:
2. INDEGREE: using the indegree_queue priority queue (ordered
by maximizing the generation number), add one to the in-
degree of each parent for each commit that is walked. Since
Whenever we delete pack-files from the object directory, we need
to also delete the multi-pack-index that may refer to those
objects. Sometimes, this connection is obvious, like during a
repack. Other times, this is less obvious, like when gc calls
a repack command and then does other actions on th
Hi Junio,
On Thu, 25 Oct 2018, Junio C Hamano wrote:
> Eric Sunshine writes:
>
> > On Mon, Oct 15, 2018 at 6:14 AM Brendan Forster via GitGitGadget
> > wrote:
> >> This config value is only used if http.sslBackend is set to "schannel",
> >> which forces cURL to use the Windows Certificate Stor
On Thu, Oct 25, 2018 at 04:04:26AM -0700, Carlo Marcelo Arenas Belón wrote:
> showing the following when compiled with latest clang (OpenBSD, Fedora
> and macOS):
s/^s/S/
This applies to your other commit messages as well.
But more importantly, please be explicit about the compiler version
that e
Hi,
when branch 'ds/test-multi-pack-index' is merged with
'ab/commit-graph-progress', IOW 'master', 'next', or 'pu',
'GIT_TEST_MULTI_PACK_INDEX=1 ./t6500-gc.sh' fails with:
expecting success:
git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
test_must_be_empt
struct commmit needs to be defined before commit-slab can generate
working code, object_id should be at least known through a forward
declaration
Signed-off-by: Carlo Marcelo Arenas Belón
---
commit-slab-impl.h | 2 ++
commit-slab.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/com
after 36da893114 ("config.mak.dev: enable -Wunused-function", 2018-10-18)
it is expected to be used to prevent -Wunused-function warnings for code
that was macro generated
Signed-off-by: Carlo Marcelo Arenas Belón
Signed-off-by: Junio C Hamano
---
commit-slab-impl.h | 4 +---
git-compat-util.h
the macro generated code from delta-islands (using khash) triggers
some unused function warnings in macOS, OpenBSD and some linux with a
newer version of clang because of its use of static functions.
Changes from v2:
* Relay in the C code including git-compat-util as suggested by Jeff
* Commit mes
showing the following when compiled with latest clang (OpenBSD, Fedora
and macOS):
delta-islands.c:23:1: warning: unused function 'kh_destroy_str'
[-Wunused-function]
delta-islands.c:23:1: warning: unused function 'kh_clear_str'
[-Wunused-function]
delta-islands.c:23:1: warning: unused
On Wed, Oct 24, 2018 at 11:49:06AM +0200, Andreas Gruenbacher wrote:
> > That is why I asked what "problem" this patch fixes. Without
> > answering that question, it is unclear if the patch is completing
> > missing coverage for "--all", or it is cargo culting an useless
> > clearing done for "--
Tommi Vainikainen writes:
> After reading SubmittingPatches I didn't find if I should now send a
> fresh patch with
> changes squashed together or new commits appended after first commit in that
> patch. Patch is updated accordingly as fresh patch.
(just on mechanics, not on the contents of your
Joshua Watt writes:
> It can be necessary to disable SMTP authentication by a mechanism other
> than sendemail.smtpuser being undefined. For example, if the user has
> sendemail.smtpuser set globally but wants to disable authentication
> locally in one repository.
>
> --smtp-auth and sendemail.sm
On Thu, Oct 11, 2018 at 12:21:44PM -0400, Derrick Stolee wrote:
> > > 2. INDEGREE: using the indegree_queue priority queue (ordered
> > > by maximizing the generation number), add one to the in-
> > > degree of each parent for each commit that is walked. Since
> > > we walk in order of
as shown by:
sequencer.c: In function ‘write_basic_state’:
sequencer.c:2392:37: warning: zero-length gnu_printf format string
[-Wformat-zero-length]
write_file(rebase_path_verbose(), "");
where write_file will create an empty file if told to write an empty string
as can be inferred by t
"brian m. carlson" writes:
> Yeah, that behavior is quite old. I'm surprised that Linux ever did
> that.
> ...
> I don't feel strongly either way. I feel confident the rest of Git
> doesn't use that field, so I don't see any downsides to keeping it other
> than the slight overhead of populating
Junio C Hamano writes:
> To be honest, I find the second sentence in your rewrite even more
> confusing. It reads as if `reset.quiet` configuration variable
> can be used to restore the "show what is yet to be added"
> behaviour, due to the parenthetical mention of the default behaviour
> witho
1 - 100 of 116 matches
Mail list logo