Uwe Kleine-König writes:
> Without passing --allow-unrelated-histories the command sequence
> fails as intended since commit e379fdf34fee ("merge: refuse to create
> too cool a merge by default"). To setup a subtree merging unrelated
> histories is normal, so add the option to the howto
"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?
Carlo Marcelo Arenas Belón writes:
> 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(), "");
The change may squelch the above warning, but doesn't it change the
Ramsay Jones writes:
>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>> index f6f4c21a54..a2d1b8b116 100644
>> --- a/Documentation/config.txt
>> +++ b/Documentation/config.txt
>> @@ -2728,6 +2728,9 @@ rerere.enabled::
>> `$GIT_DIR`, e.g. if "rerere" was previously used
Eric Sunshine writes:
>> +test_commit 1 &&
>> +test_config user.useconfigonly true &&
>> +test_config stash.usebuiltin true &&
>> +sane_unset GIT_AUTHOR_NAME &&
>> +sane_unset GIT_AUTHOR_EMAIL &&
>> +sane_unset GIT_COMMITTER_NAME &&
>> +sane_unset GIT_COMMITTER_EMAIL
Slavica writes:
> On 23-Oct-18 8:52 PM, Christian Couder wrote:
>> On Tue, Oct 23, 2018 at 6:35 PM Slavica wrote:
>>> This is part of enhancement request that ask for `git stash` to work even
>>> if `user.name` is not configured.
>>> The issue is discussed here:
>>>
Johannes Schindelin writes:
>> HOME is set to TRASH_DIRECTORY in t/test-lib.sh already, and we do
>> so to avoid getting affected by the real $HOME/.gitconfig of the
>> user who happens to be running the test suite.
>
> My bad. I should have checked. I was under the impression that we set
>
Johannes Schindelin writes:
> On Wed, 24 Oct 2018, Junio C Hamano wrote:
>
>> "Johannes Schindelin via GitGitGadget"
>> writes:
>>
>> > Changes since v1:
>> >
>> > * Fixed a grammar mistake in the second commit message.
>
Jeff King writes:
> I do hope that some options will just be no-brainers to enable always,
> though (e.g., I think in the long run commit-graph should just default
> to "on"; it's cheap to keep up to date and helps proportionally to the
> repo size).
Same here.
We should strive to make any
Duy Nguyen writes:
> The person who writes
>
> printf(_("%s"), getenv("foo"));
>
> may not go through the same thought process as with complexFunction().
> If _() calls getenv(), because you the order of parameter evaluation
> is unspecified, you cannot be sure if getenv("foo") will be called
>
d things like "$Feature is not activated, your curl version is
too old (>= $Version)", and without marking them for l10n.
Update these to match the style of the majority of warnings and mark
them for l10n.
Signed-off-by: Junio C Hamano
---
> I have a clean-up suggestion rela
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 Store when validating
>> server certificates associated with a remote
Johannes Schindelin writes:
> On Wed, 24 Oct 2018, Jeff King wrote:
>
>> t5410 creates a sample script "alternate-refs", and sets
>> core.alternateRefsCommand to just "alternate-refs". That
>> shouldn't work, as "." is not in our $PATH, and so we should
>> not find it.
>>
>> However, due to a
Duy Nguyen writes:
> OK. Just to be sure we're on the same page. Am I waiting for all
> config changes to land in 'master', or do I rebase my series on
> 'next'? I usually base on 'master' but the mention of 'next' here
> confuses me a bit.
I was hoping that you can do something like:
$ git
Jeff King writes:
> but then you lose the default handling. I think if we added a new
> option, it would either be:
>
> # interpret a value directly; use default on empty, I guess?
> git config --default=false --type=bool --interpret-value "$GIT_WHATEVER_ENV"
>
> or
>
> # less flexible,
"Johannes Schindelin via GitGitGadget"
writes:
> Changes since v1:
>
> * Fixed a grammar mistake in the second commit message.
Thanks. I think this matches what I earlier queued on 'pu' with
Stephen's typofix squashed in, so we are good already.
Johannes Schindelin writes:
> Hi Junio,
>
> On Wed, 24 Oct 2018, Junio C Hamano wrote:
>
>> Slavica writes:
>>
>> > +test_expect_failure 'stash with HOME as non-existing directory' '
>> > +test_commit 1 &&
>> > +t
Andreas Gruenbacher writes:
>> All other glob options do show_reference with for_each_ref_in() and
>> then calls clear_ref_exclusion(), and logically the patch makes
>> sense.
>>
>> What is the "problem" this patch fixes, though? Is it easy to add a
>> new test to t/6018-rev-list-glob.sh to
Junio C Hamano writes:
>> Seems a bit overkill to pull a line of documentation into a separate
>> file and replace it with a line of 'import' logic. Perhaps if/when
>> there is more documentation to pull out that would make more sense.
>
> This change (ehh, rather, perha
Stefan Beller writes:
>> You would want to be able to remove a submodule and replace it with
>> a directory, but you can probably do it in two steps, i.e.
>>
>> git reset --hard
>> git rm --cached sha1collisiondetection
>> echo Now a regular dir
Ævar Arnfjörð Bjarmason writes:
> Notes on the implementation:
>
> * The only reason we need a new "git-sh-i18n--helper" and the
>corresponding "test-tool gettext-poison" is to expose
>git_env_bool() to shellscripts, since git-sh-i18n and friends need
>to inspect the
Junio C Hamano writes:
> Lucas De Marchi writes:
>
>> Your reply arrived just a little after I sent the v2, so I thought it
>> was just the race and you would end up seeing the unread email in the
>> same thread. Sorry for not including the msg id:
>> 2018
Lucas De Marchi writes:
> Your reply arrived just a little after I sent the v2, so I thought it
> was just the race and you would end up seeing the unread email in the
> same thread. Sorry for not including the msg id:
> 20181011081750.24240-1-lucas.demar...@intel.com
OK, then I am not
Denton Liu writes:
> Subject: Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments
Other people may point it out, but s/Accept/accept/.
> 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
>
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 NULL"
is something everybody would understand and agree with, but
Andreas Gruenbacher writes:
> Commit [1] added the --exclude option to revision.c. The --all,
> --branches, --tags, --remotes, and --glob options clear the exclude
> list. Shortly therafter, commit [2] added the same to 'git rev-parse',
> but without clearing the exclude list for the --all
"Johannes Schindelin via GitGitGadget"
writes:
> diff --git a/builtin/repack.c b/builtin/repack.c
> index c6a7943d5..9217fc832 100644
> --- a/builtin/repack.c
> +++ b/builtin/repack.c
> @@ -549,6 +549,12 @@ int cmd_repack(int argc, const char **argv, const char
> *prefix)
> if
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 parent of, or an immediate
child of a promisor object. I _think_ this change won't make it
worse for two features in playing
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> A `git fetch --prune` can turn previously-reachable objects unreachable,
> even commits that are in the `shallow` list. A subsequent `git repack
> -ad` will then unceremoniously drop those unreachable commits, and
Matthew DeVore writes:
> On Tue, 23 Oct 2018, Junio C Hamano wrote:
>
>> Not really. We were already doing a controlled failure via die(),
>> so these two tests would not have caught the problem in the code
>> before the fix in this patch.
>>
>
> BUG is app
Carlo Marcelo Arenas Belón writes:
> in f48000fc ("Yank writing-back support from gitfakemmap.", 2005-10-08)
> support for writting back changes was removed but the specific prot
> flag that would be used was not checked for
>
> Acked-by: Johannes Schindelin
> Signed-off-by: Carlo Marcelo
ementing it every time we do
something, and checking if we have already done that thing to guard
the code to do that thing, is easier to understand when written
if (u++)
; /* we've done that! */
else
do_it(); /* just once. */
but if you try to use pre-incre
Lucas De Marchi writes:
>> Yes, I agree on both counts (i.e. it was totally unclear what
>> problem is being solved and what the root cause of the problem is,
>> and we would want a new test to protect this "fix" from getting
>> broken in the future.
>
> have you seen I sent a v2 with proper
"brian m. carlson" writes:
> On Mon, Oct 22, 2018 at 06:38:19PM +0200, Michał Górny wrote:
>> Replace the logic used to determine whether key and signer information
>> is present to use explicit flags in sigcheck_gpg_status[] array. This
>> is more future-proof, since it makes it possible to
Carlo Marcelo Arenas Belón writes:
> contrib/nedmalloc doesn't support MALLOC_CHECK_ or MALLOC_PERTURB_
> so add it to the same exception that is being used with valgrind
>
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
> t/test-lib.sh | 2 +-
> 1 file changed, 1 insertion(+), 1
Jeff King writes:
> I also think we may want to make a fundamental shift in our view of
> thread support. In the early days, it was "well, this is a thing that
> modern systems can take advantage of for certain commands". But these
> days I suspect it is more like "there are a handful of legacy
Ben Peart writes:
>>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>>> index f6f4c21a54..a2d1b8b116 100644
>>> --- a/Documentation/config.txt
>>> +++ b/Documentation/config.txt
>>> @@ -2728,6 +2728,9 @@ rerere.enabled::
>>> `$GIT_DIR`, e.g. if "rerere" was previously
Slavica writes:
> +test_expect_failure 'stash with HOME as non-existing directory' '
> +test_commit 1 &&
> +test_config user.useconfigonly true &&
> +test_config stash.usebuiltin true &&
> +(
> +HOME=$(pwd)/none &&
> +export HOME &&
What is the reason why this
Carlo Arenas writes:
> On Tue, Oct 23, 2018 at 2:40 AM Junio C Hamano wrote:
>>
>> The tip of 'pu' has trouble with -Wunused on Apple around the
>> delta-islands series.
>
> FWIW the "problem" is actually with -Wunused-function and is AFAIK not
> relat
Junio C Hamano writes:
> I actually think this round does a far nicer job playing well with
> other topics than any earlier series. The pain you are observing I
> think come primarily from my not making the best use of these
> patches.
>
> Steppng back a bit, I'd imagine in an
Matthew DeVore writes:
> t/t4202-log.sh | 4
> t/t8002-blame.sh | 4
> 7 files changed, 14 insertions(+), 1 deletion(-)
> ...
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 153a506151..819c24d10e 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -1703,4
Matthew DeVore writes:
> This patch set fixes incorrect parsing of the --exclude-promisor-objects
> option that I found while working on:
>
> https://public-inbox.org/git/cover.1539298957.git.matv...@google.com/
>
Thanks; both patches make sense.
As the problematic feature appeared in
Stefan Beller writes:
> Am I overestimating or misunderstanding rerere here?
Yes.
> Would it be realistic for next and master branch instead of pu?
>
> I'd be wary for the master branch, as we may not want to rely on
> spatch without review. (It can produce funny white space issues,
> but
SZEDER Gábor writes:
>> To prevent that from happening, let's append `^0` after the stash hash,
>> to make sure that it is interpreted as an OID rather than as a number.
>
> Oh, this is clever.
Yeah, we can do this as we know we'd be dealing with a commit-ish.
If we made a mistake to use a tree
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 '
>
> test_lazy_prereq GZIP 'gzip --version'
>
>
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.
I wonder if it would be more
Ben Peart writes:
> From: Ben Peart
>
> refresh_index() is done after a reset command as an optimization. Because
> it can be an expensive call, warn the user if it takes more than 2 seconds
> and tell them how to avoid it using the --quiet command line option or
> reset.quiet config setting.
Jeff King writes:
> If nobody uses it, should we drop the return value, too? Like:
Yup.
>
> diff --git a/read-cache.c b/read-cache.c
> index 78c9516eb7..4b44a2eae5 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -2052,12 +2052,11 @@ static void *load_cache_entries_thread(void *_data)
>
Ævar Arnfjörð Bjarmason writes:
> So I think the only reason to keep it compile-time is performance, but I
> don't think that matters. It's not like we're printing gigabytes of _()
> formatted output. Everything where formatting matters is plumbing which
> doesn't use this API. These messages
SZEDER Gábor writes:
> I don't really like how this or the previous RFC patch series deal
> with semantic patches (or how some past patch series dealt with them,
> for that matter), for various reasons:
> ...
> How about introducing the concept of "pending" semantic patches,
> stored in
Carlo Marcelo Arenas Belón writes:
> this macro is commonly defined in system headers (usually )
> but if it is not define it here so it can be used elsewhere
>
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
I am between "meh" and "moderately negative" on this change.
- Definition of MIN
Carlo Marcelo Arenas Belón writes:
> it is already defined whenever "sys/param.h" is available
>
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
> sha256/block/sha256.c | 2 ++
> 1 file changed, 2 insertions(+)
It is a no-brainer to say that this is obviously good. I'd rather
see this
Carlo Marcelo Arenas Belón writes:
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
> xdiff/xdiffi.c | 2 +-
> xdiff/xemit.c | 6 +++---
> xdiff/xhistogram.c | 6 +++---
> xdiff/xmacros.h| 4 +---
> xdiff/xprepare.c | 2 +-
> 5 files changed, 9 insertions(+), 11 deletions(-)
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> err &&
Because test_must_fail is a shell function, the above is not a
correct way to say "I want
Ævar Arnfjörð Bjarmason writes:
> I've set this up at https://gitlab.com/git-vcs
>
> The /git namespace was taken (and I asked GitLab support if it was
> stale, they said no). Also tried /git-scm and /gitscm, ditto. So I
> settled on /git-vcs (version control system).
Squatters X-<. Thanks.
>
Ben Peart writes:
> On 10/19/2018 1:11 PM, Jeff King wrote:
>> On Fri, Oct 19, 2018 at 01:10:34PM -0400, Eric Sunshine wrote:
>>
>>> On Fri, Oct 19, 2018 at 12:46 PM Jeff King wrote:
On Fri, Oct 19, 2018 at 12:36:44PM -0400, Eric Sunshine wrote:
> How does the user reverse this for a
Nguyễn Thái Ngọc Duy writes:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 552827935a..244560a35e 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -2,8 +2,9 @@ CONFIGURATION FILE
> --
>
> The Git configuration file
Nguyễn Thái Ngọc Duy writes:
> Subject: Re: [PATCH v3 2/8] Add a place for (not) sharing stuff between
> worktrees
"a place"? Missing "in $GIR_DIR" in the descrition made me read the
above three times before getting what it wanted to say.
My attempt to improve it, which admittedly is not
Nguyễn Thái Ngọc Duy writes:
> __gitcomp_builtin() has the main completion list provided by
>
> git xxx --git-completion-helper
>
> but the caller can also add extra options that is not provided by
> --git-completion-helper. The only call site that does this is "git
> difftool" completion.
Duy Nguyen writes:
>> freshen_shared_index(base_path, 0);
>> merge_base_index(istate);
>> post_read_index_from(istate);
>> - free(base_path);
>> trace_performance_leave("read cache %s", base_path);
>> + free(base_path);
>
> Oops. Ack.
Thanks, both.
Torsten Bögershausen writes:
> Initializing a variable to "BAD" in the beginning can be a good thing
> for two reasons:
> - There is a complex if-elseif chain, which should set retval
> in any case, this is at least what I expect taking a very quick look at the
> code:
> ...
> # The second
Jeff King writes:
> On Fri, Oct 19, 2018 at 04:19:28PM -0700, stead...@google.com wrote:
>
>> diff --git a/builtin/archive.c b/builtin/archive.c
>> index e74f675390..dd3283a247 100644
>> --- a/builtin/archive.c
>> +++ b/builtin/archive.c
>> @@ -45,7 +45,10 @@ static int run_remote_archiver(int
Joey Hess writes:
> How about changing the documentation to something like this to make
> more explicit what it does.
>
>--with-tree=
>Treat all files in the as if they were present in the
> index.
>When using --error-unmatch to expand the user supplied (i.e.
>
Jonathan Nieder writes:
> Stefan Beller wrote:
>
>> Maybe for now we can do with just an update of the documentation/bugs
>> section and say we cannot move files in and out of submodules?
>
> I think we have some existing logic to prevent "git add"-ing a file
> within a submodule to the
Derrick Stolee writes:
> On 10/19/2018 1:24 AM, Junio C Hamano wrote:
>> "Derrick Stolee via GitGitGadget" writes:
>>
>>> We can also re-run the performance tests from commit 4fbcca4e
>>> "commit-reach: make can_all_from_reach... linear".
>
Matthew DeVore writes:
>> It is more like "this is a set operation across commits. We also
>> show objects that are reachable from the commits in the resulting
>> set and are not reachable from the commits in the set that were
>> excluded when --objects option is given".
>>
> That would be
Jeff King writes:
> On Wed, Oct 10, 2018 at 11:59:38AM -0400, Ben Peart wrote:
>
>> +static unsigned long load_cache_entries_threaded(struct index_state
>> *istate, const char *mmap, size_t mmap_size,
>> +unsigned long src_offset, int nr_threads, struct
>>
Derrick Stolee writes:
>> base-commit: 5a0cc8aca797dbd7d2be3b67458ff880ed45cddf
> I should explicitly mention that this base commit is different as
> otherwise I will conflict with ds/multi-pack-verify with the new
> prototype in midx.h.
There indeed is a tiny textual conflict, and in this case
Jeff King writes:
> I agree it's probably quite rare, if it exists at all. But I also wonder
> how important looping alias protection is. It's also rare, and the
> outcome is usually "gee, I wonder why this is taking so long? ^C".
>
> At least that's my instinct. I don't remember having run into
Jakub Narebski writes:
> So if revs->limited is set (but not because revs->topo_order is set),
> which means A..B queries, we will be still using the old algorithm.
> All right, though I wonder if it could be improved in the future
> (perhaps with the help of other graph labelling / indices than
Michał Górny writes:
>> Very minor point but by not using pre-increment, i.e.
>>
>> if (seen_exclusive_status++)
>> goto found_duplicate_status;
>>
>> you can use the expression as a "have we already seen?" boolean,
>> whic may probably be more idiomatic.
>>
Michał Górny writes:
> GnuPG supports creating signatures consisting of multiple signature
> packets. If such a signature is verified, it outputs all the status
> messages for each signature separately. However, git currently does not
> account for such scenario and gets terribly confused over
Alban Gruin writes:
> The error comes from the call to `git stash apply $stash_id' in
> builtin/rebase.c:261. When $stash_id only contains decimals and no
> letters, git-stash tries to apply stash@{$stash_id}[0][1]. Thas was not
> a real problem with the shell script, because it did not
Ævar Arnfjörð Bjarmason writes:
> I had a slight bias against this when you started this, since I'm one of
> these odd people who don't mind ~20k line files if the line count isn't
> contributing to inherent complexity, e.g. in the case of config.txt you
> could just use the search function all
SZEDER Gábor writes:
>> >> +if test true = "$TRAVIS"
>> >> +then
>> >> +...
>> >> + export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
>> >> + export GIT_TEST_OPTS="--verbose-log -x --immediate"
>> >> +fi
>> > ...
>
> $GIT_PROVE_OPTS and $GIT_TEST_OPTS, however, are only used in
>
SZEDER Gábor writes:
>> if (entry)
>> -fprintf(out, "\n%c Branch %s\n", comment_line_char,
>> entry->string);
>> +strbuf_addf(out, "\n%c Branch %s\n", comment_line_char,
>> entry->string);
>> else
>> -
Stefan Beller writes:
> This rerolls sb/more-repo-in-api.
> It applies on nd/the-index merged with ds/reachable and is available via
> git fetch https://github.com/stefanbeller/git object-store-final-3
Thanks. Luckily we have both of these prerequisites in 'master'
now, o hopefully this
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Two large set of topics on
"Derrick Stolee via GitGitGadget" writes:
> We can also re-run the performance tests from commit 4fbcca4e
> "commit-reach: make can_all_from_reach... linear".
>
> Performance was measured on the Linux repository using
> 'test-tool reach can_all_from_reach'. The input included rows seeded by
>
-by: Rajesh Madamanchi
Signed-off-by: Junio C Hamano
---
builtin/receive-pack.c | 12 +---
t/t5516-fetch-push.sh | 8 +++-
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 95740f4f0e..79ee320948 100644
--- a/builtin
r existing refs. Replace it with a hashmap.
Signed-off-by: Junio C Hamano
---
* This converts another string-list user in the same file. For now
I am done with this topic; I'm willing to fix bugs in this patch,
but do not intend to spend time killing more string-lists used as
look
Junio C Hamano writes:
> Rajesh Madamanchi writes:
>
>> Hi, I am looking to report the below behavior when seems incorrect to
>> me when receive.denyCurrentBranch is set to updateInstead and
>> receive.denyNonFastForwards is set to true.
>
> It seems that we t
Jonathan Tan writes:
> Jonathan Tan (3):
> upload-pack: make have_obj not global
> upload-pack: make want_obj not global
> upload-pack: clear flags before each v2 request
It took a bit of time why 2/3 did not apply cleanly but it turns out
this is based on a slightly older tip of 'master'
Jonathan Nieder writes:
> Junio C Hamano wrote:
> ...
>> It is a good idea to implicitly include the promisor-remote to the
>> set of secondary places to consult to help existing versions of Git,
>> but once the repository starts fetching incomplete sub
"Derrick Stolee via GitGitGadget" writes:
> I originally reported this fix [1] after playing around with the trace2
> series for measuring performance. Since trace2 isn't merging quickly, I
> pulled the performance fix patch out and am sending it on its own. The only
> difference here is that we
Carlo Marcelo Arenas Belón writes:
> it is initialized unconditionally by a call to start_progress
> below.
>
> Signed-off-by: Carlo Marcelo Arenas Belón
> ---
> midx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/midx.c b/midx.c
> index ea2f3ffe2e..4fac0cd08a
SZEDER Gábor writes:
> On Mon, Oct 15, 2018 at 03:12:00AM -0700, Johannes Schindelin via
> GitGitGadget wrote:
>> diff --git a/ci/lib.sh b/ci/lib.sh
>> index 06970f7213..8532555b4e 100755
>> --- a/ci/lib.sh
>> +++ b/ci/lib.sh
>> @@ -1,5 +1,26 @@
>> # Library of functions shared by all CI
tbo...@web.de writes:
> bulk-checkin.c | 4 ++--
> bulk-checkin.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
If you lost SP in your editor, then it is OK but if format-patch
lost it for some reason, plasee tell me as we need to find the bug.
>
> diff --git a/bulk-checkin.c
Johannes Sixt writes:
> Use is_absolute_path() to detect Windows style absolute paths.
When cd676a51 ("diff --relative: output paths as relative to the
current subdirectory", 2008-02-12) was done, neither "is_dir_sep()"
nor "has_dos_drive_prefix()" existed---the latter had to wait until
Ramsay Jones writes:
> I haven't looked too deeply, but this seems to be caused by
> Junio's commit 42c89ea70a ("SQUASH??? - convert the other user of
> string-list as db", 2018-10-17) which removes a call to the
> add_existing() function - the subject of the warning.
That is very
Derrick Stolee writes:
> This code from builtin/gc.c makes it look like we are doing that:
>
> if (gc_write_commit_graph)
> write_commit_graph_reachable(get_object_directory(), 0,
> !quiet && !daemonized);
>
> But really,
Ben Peart writes:
> Note the status command after the reset doesn't really change as it
> still must lstat() every file (the 0.02 difference is well within the
> variability of run to run differences).
Of course, it would not make an iota of difference, whether reset
refreshes the cached stat
Rajesh Madamanchi writes:
> Hi, I am looking to report the below behavior when seems incorrect to
> me when receive.denyCurrentBranch is set to updateInstead and
> receive.denyNonFastForwards is set to true.
It seems that we took a lazy but incorrect route while adding the
DENY_UPDATE_INSTEAD
Jonathan Tan writes:
>> [object]
>> missingObjectRemote = local-cache-remote
>> missingObjectRemote = origin
>>
> In the presence of missingObjectRemote, old versions of Git, when lazily
> fetching, would only know to try the extensions.partialClone remote. But
>
SZEDER Gábor writes:
> So, then it's either 'config.mak', or passing a 'CC=$CC' argument to
> _all_ make commands, including those that are not supposed to build
> anything, but only run the tests. I find the latter aesthetically not
> particularly pleasing.
The config.mak file is available
Andreas Gruenbacher writes:
>> > # is --stdin a selector, too?
>> > branches | git log --stdin --not origin/master
>
> Yes, it's a positive selector (since --not doesn't apply to --stdin).
But you should be able to do
printf "%s\n" ^maint master | git rev-list --stdin
Replace the
Stefan Beller writes:
> This is based on ao/submodule-wo-gitmodules-checked-out.
>
> This resends origin/sb/submodule-recursive-fetch-gets-the-tip, resolving
> the issues pointed out via
> origin/xxx/sb-submodule-recursive-fetch-gets-the-tip-in-pu
> by basing this series on
Jeff King writes:
> Just to play devil's advocate, how about this:
>
> git log --branches=jk/* --not origin/master
>
> Right now that shows nothing if there are no matching branches. But I
> think under the proposed behavior, it would start showing HEAD, which
> seems counter-intuitive.
>
> Or
Jeff King writes:
> Presumably it came from the manual comment-style fixup.
Wow, that was embarrassing. Thanks for catching it.
>
> With that fix, the tests run fine for me under ASan/UBSan (with the
> exception of t5310, but that's fixed already in a parallel topic).
>
> -Peff
Elijah Newren writes:
> @@ -1283,6 +1302,18 @@ static int merge_mode_and_contents(struct
> merge_options *o,
> const char *branch2,
> struct merge_file_info *result)
> {
> + if (o->branch1 != branch1) {
> + /*
>
501 - 600 of 27729 matches
Mail list logo
