A year ago, I raised as
an issue,
which lead to commit commit a56771a668dd4963675914bc5da0e1e015952dae.
The exact same workload somewhere between 2.18.0 and 2.19.0 has caused
the message to come back. I noticed it first in a 2.18.0->2.21.0
upgrade, and did a partial bisect based on tags to trace
On 2019-04-09 18:46, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
>>> 1cadad6f6 removes mingw_offset_1st_component from mingw.c which is
>>> included by msvc.c. Then the in git-compat.h the new file
>>> "compat/win32/path-utils.h" is only included for __CYGWIN__ and
>>> __MINGW32__, here
Junio C Hamano writes:
> As to the design, it does not quite matter if you add four or more
> separate trees to represent stage #[0123] entries in the index to
> the already octopus merge commit that represents a stash entry ...
I forgot that I was planning to expand on this part while writing
t
On Wed, Apr 10, 2019 at 4:45 AM Jonathan Tan wrote:
>
> This is useful when investigating performance of pushes, and other times
> when no progress information is written (because the pack is written to
> stdout).
>
> Signed-off-by: Jonathan Tan
> ---
> We're trying to improve push performance, a
Kapil Jain writes:
> Plan to implement the project.
>
> Objective:
>
> Description:
>
> Implementation Idea:
>
> Relevant Discussions:
>
> Idea Execution Plan: Divided into 2 parts.
Two things missing before implementation idea are design, and more
importantly, the success criteria. What lets y
Kyle Meyer writes:
> The series improves the handling of sub-repositories that don't have a
> commit checked out. In particular, it addresses the following issues:
> ...
> * Commit message tweaks. These include replacing wording like "no
> commits" with something like "no commit checked o
Jonathan Tan writes:
> This is useful when investigating performance of pushes, and other times
> when no progress information is written (because the pack is written to
> stdout).
>
> Signed-off-by: Jonathan Tan
> ---
> We're trying to improve push performance, and it would be nice to be
> able
Jonathan Nieder writes:
> Thanks for writing this. I'd be in favor of making this die().
> Compare what we already do in push:
>
> if (args->push_options && !push_options_supported)
> die(_("the receiving end does not support push options"));
That's a good point.
> What hap
Jonathan Nieder writes:
> nit: I was confused when first reading this, since I read "the
> configuration $target_xfer_encoding" as a single phrase. A comma
> after "configuration" might help.
> ...
> run-on sentence. I'm having trouble parsing this part.
I had the same issue with the wording.
Todd Zullinger writes:
> Thanks for testing these against older Asciidoctor and for the
> helpful feedback on the commit messages.
>
> I reworded the message in the first commit to make it clearer
> that Asciidoctor renders the {apostrophe} literally. I updated
> the body of the second commit
Denton Liu writes:
>> * dl/submodule-set-branch (2019-02-08) 3 commits
>> ...
>> Needs sign-off on the tip commit; other than that it seems OK to be in
>> 'next'.
>
> This has been here for a while. Did you need my explicit sign-off for
> this? If that's the case, here you go:
>
> Signed-off-b
Thomas Gummerer writes:
> On 04/10, Junio C Hamano wrote:
>
>> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
>> (merged to 'next' on 2019-04-10 at 9489a31a36)
>> + stash: setup default diff output format if necessary
>> (this branch uses ps/stash-in-c; is tangled with js/stash-i
Fix one of the cases described in the previous commit where a tree-entry
that is promised to a blob is in fact a non-blob.
When 'lookup_blob()' returns NULL, it is because Git has cached the
requested object as a non-blob. In this case, prevent a SIGSEGV by
'die()'-ing immediately before attemptin
Apply similar treatment as the previous commit for non-tree entries,
too.
Signed-off-by: Taylor Blau
---
list-objects.c | 5 +
t/t6102-rev-list-unexpected-objects.sh | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/list-objects.c b/list-object
The helper 'hex2oct' is used to convert base-16 encoded data into a
base-8 binary form, and is useful for preparing data for commands that
accept input in a binary format, such as 'git hash-object', via
'printf'.
This helper is defined identically in three separate places throughout
't'. Move the
From: Jeff King
Commit 7c0fe330d5 (rev-list: handle missing tree objects properly,
2018-10-05) taught the traversal machinery used by git-rev-list to
ignore missing trees, so that rev-list could handle them itself.
However, it does so only by checking via oid_object_info_extended() that
the obje
Call an object's type "unexpected" when the actual type of an object
does not match Git's contextual expectation. For example, a tree entry
whose mode differs from the object's actual type, or a commit's parent
which is not another commit, and so on.
This can manifest itself in various unfortunate
From: Jeff King
Return NULL from 'get_commit_tree()' when a commit's root tree is
corrupt, doesn't exist, or points to an object which is not a tree.
In [1], this situation became a BUG(), but it can certainly occur in
cases which are not a bug in Git, for e.g., if a caller manually crafts
a com
Hi everyone,
Here is 'v2' of mine and Peff's series to add tests for and fix some
cases when object connections are malformed in various ways.
There aren't many major changes from the initial version, but what has
changed is described briefly here, and in complete detail in the
range-diff at the
From: Jeff King
When the traversal machinery sees a commit without a root tree, it
assumes that the tree was part of a BOUNDARY commit, and quietly ignores
the tree. But it could also be caused by a commit whose root tree is
broken or missing.
Instead, let's die() when we see a NULL root tree. W
Hi Ævar,
On Tue, Apr 09, 2019 at 11:14:48AM +0200, Ævar Arnfjörð Bjarmason wrote:
>
> On Tue, Apr 09 2019, Taylor Blau wrote:
>
> > Hi Ævar,
> >
> > On Sun, Apr 07, 2019 at 11:00:19PM +0200, Ævar Arnfjörð Bjarmason wrote:
> >>
> >> On Fri, Apr 05 2019, Jeff King wrote:
> >>
> >> > On Fri, Apr 05,
Hi Eric,
On Tue, Apr 09, 2019 at 04:02:23AM -0400, Eric Sunshine wrote:
> On Tue, Apr 9, 2019 at 1:09 AM Taylor Blau wrote:
> > On Mon, Apr 08, 2019 at 11:28:19PM -0400, Eric Sunshine wrote:
> > > I suspect that Junio's "Looks good" was referring to the 'sed expression.
> >
> > I think that you a
Hi,
Junio C Hamano wrote:
> * tz/doc-apostrophe-no-longer-needed (2019-04-08) 1 commit
> - Documentation/git-show-branch: drop last use of {apostrophe}
>
> Doc formatting fix.
>
> Will merge to 'next'.
>
>
> * tz/git-svn-doc-markup-fix (2019-04-08) 1 commit
> - Documentation/git-svn: impro
Martin Ågren wrote:
> I think what's happening could be related to the fix in the first patch.
> There, it's ok to explicitly escape only the first '. The second one is
> matched to it and gets escaped implicitly. Something like that could be
> happening here, too, just that we don't want it to. (S
Hi,
Martin Ågren wrote:
> On Sat, 6 Apr 2019 at 00:51, Todd Zullinger wrote:
>> Here's what I have currently. I haven't tested this much with
>> asciidoctor-1.5.x releases (or maybe not at all -- it's been a
>> week or so since I worked on this).
>
> Tested with Asciidoctor 1.5.5. For both patc
The {apostrophe} was needed at the time of a521845800 ("Documentation:
remove stray backslash in show-branch discussion", 2010-08-20). All
other uses of {apostrophe} were removed in 6cf378f0cb ("docs: stop using
asciidoc no-inline-literal", 2012-04-26).
Unfortunately, the {apostrophe} is rendered
The second paragraph in the CONFIGURATION section intends to emphasize
the word 'must' with bold type. It does so by writing it as *must*, and
this works fine with AsciiDoc. It usually works great with Asciidoctor,
too, but in this particular instance, we have another "*" earlier in the
paragraph.
On 2019.04.09 20:04, SZEDER Gábor wrote:
> On Mon, Apr 08, 2019 at 02:06:04PM -0700, Josh Steadmon wrote:
> > For large repositories, enumerating the list of all promisor objects (in
> > order to exclude them from a rev-list walk) can take a significant
> > amount of time).
> >
> > When --exclude-
On 4/9/19 11:58 PM, Jonathan Nieder wrote:
> (thanks for cc-ing bmc!)
> Hi,
>
> Heinrich Schuchardt wrote:
>
>> Subject: send-email: fix transferencoding config option
>
> nit: "fix" doesn't tell me what was broken and what you improved about
> it. Here, I think you mean "respect transferencoding
The previous commit made 'git add' abort when given a repository that
doesn't have a commit checked out. However, the output upon failure
isn't appropriate:
% git add repo
warning: adding embedded git repository: repo
hint: You've added another git repository inside your current repository.
When the path given to 'git submodule add' is an existing repository
that is not in the index, the repository is passed to 'git add'. If
this repository doesn't have a commit checked out, we don't get a
useful result: there is no subproject OID to track, and any untracked
files in the sub-reposito
This is a reroll of <20190402183505.31512-1-k...@kyleam.com>. Thanks,
Junio, for your comments on v2.
The series improves the handling of sub-repositories that don't have a
commit checked out. In particular, it addresses the following issues:
* Calling 'git add repo' is meant to register the
When treat_directory() encounters a directory that is not in the index
and DIR_NO_GITLINKS is unset, it calls resolve_gitlink_ref() to decide
if a directory looks like a repository, in which case the directory
won't be traversed. As a result, 'status -uall' and 'ls-files -o'
will show only the dir
On 4/10/19 12:55 AM, brian m. carlson wrote:
> On Tue, Apr 09, 2019 at 09:27:33PM +0200, Heinrich Schuchardt wrote:
>> diff --git a/Documentation/git-send-email.txt
>> b/Documentation/git-send-email.txt
>> index 1afe9fc858..884e776add 100644
>> --- a/Documentation/git-send-email.txt
>> +++ b/Docum
On Tue, Apr 09, 2019 at 09:27:33PM +0200, Heinrich Schuchardt wrote:
> diff --git a/Documentation/git-send-email.txt
> b/Documentation/git-send-email.txt
> index 1afe9fc858..884e776add 100644
> --- a/Documentation/git-send-email.txt
> +++ b/Documentation/git-send-email.txt
> @@ -146,7 +146,7 @@ No
(thanks for cc-ing bmc!)
Hi,
Heinrich Schuchardt wrote:
> Subject: send-email: fix transferencoding config option
nit: "fix" doesn't tell me what was broken and what you improved about
it. Here, I think you mean "respect transferencoding config option".
> Since e67a228cd8a ("send-email: automa
This is useful when investigating performance of pushes, and other times
when no progress information is written (because the pack is written to
stdout).
Signed-off-by: Jonathan Tan
---
We're trying to improve push performance, and it would be nice to be
able to observe the number of objects sent
Jonathan Tan wrote:
> Commit 5e3548ef16 ("fetch: send server options when using protocol v2",
> 2018-04-24) taught "fetch" the ability to send server options when using
> protocol v2, but not "clone". This ability is triggered by "-o" or
> "--server-option".
>
> Teach "clone" the same ability, exc
Hi,
Jonathan Tan wrote:
> Server options were added in commit 5e3548ef16 ("fetch: send server
> options when using protocol v2", 2018-04-24), supported only for
> protocol version 2. Add a warning if server options are specified for
> the user if a legacy protocol is used instead.
>
> An effort i
Server options were added in commit 5e3548ef16 ("fetch: send server
options when using protocol v2", 2018-04-24), supported only for
protocol version 2. Add a warning if server options are specified for
the user if a legacy protocol is used instead.
An effort is made to avoid printing the same war
I created v2 by rewriting jt/clone-server-option, so you'll see some
Reviewed-by lines and Signed-off-by lines with another name than mine.
Changes from v1:
- Broke long line. (DUP->NODUP was already done by Junio in
jt/clone-server-option, so you don't see it in the range-diff below.)
- Warn
Commit 5e3548ef16 ("fetch: send server options when using protocol v2",
2018-04-24) taught "fetch" the ability to send server options when using
protocol v2, but not "clone". This ability is triggered by "-o" or
"--server-option".
Teach "clone" the same ability, except that because "clone" already
Since e67a228cd8a ("send-email: automatically determine transfer-encoding")
the value of sendmail.transferencoding is ignored because when parsing
the configuration $target_xfer_encoding is not initial anymore.
Instead of initializing variable $target_xfer_encoding on definition we
have to set it
On 04/10, Junio C Hamano wrote:
> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
> (merged to 'next' on 2019-04-10 at 9489a31a36)
> + stash: setup default diff output format if necessary
> (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix
> and tb/stash-
On 4/9/19 11:56 AM, Barret Rhoden wrote:
Anyway, being able to look outside the current blame_chunk would help in
those scenarios. Specifically, I'm talking about letting blame_chunk()
point anywhere in the parent. Right now, it can only look in the
parent's part of the chunk passed to blame_
> Does the code behave sensibly when the --server-option=... option is
> given and
>
> (a) the given option is not understood by the other side that talks
> protocol v2? Or
>
> (b) it turns out that the other side does not talk protocol v2?
>
> In the former case, I would expect that the
Hi Junio,
On Wed, Apr 10, 2019 at 03:08:09AM +0900, Junio C Hamano wrote:
> * dl/submodule-set-branch (2019-02-08) 3 commits
> - submodule: teach set-branch subcommand
> - submodule--helper: teach config subcommand --unset
> - git-submodule.txt: "--branch " option defaults to 'master'
>
> "gi
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.
Sorry for keeping a rather huge ba
On Mon, Apr 08, 2019 at 02:06:04PM -0700, Josh Steadmon wrote:
> For large repositories, enumerating the list of all promisor objects (in
> order to exclude them from a rev-list walk) can take a significant
> amount of time).
>
> When --exclude-promisor-objects is passed to rev-list, don't enumera
On Tue, Apr 9, 2019 at 6:27 AM Nguyễn Thái Ngọc Duy wrote:
> A new attribute "precious" is added to indicate that certain files
> have valuable content and should not be easily discarded even if they
> are ignored or untracked.
> [...]
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/t/
Torsten Bögershausen writes:
>> 1cadad6f6 removes mingw_offset_1st_component from mingw.c which is
>> included by msvc.c. Then the in git-compat.h the new file
>> "compat/win32/path-utils.h" is only included for __CYGWIN__ and
>> __MINGW32__, here _MSC_VER is missing -> that's the regression.
>>
On 2019.04.10 00:43, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Wed, Apr 10, 2019 at 12:14:41AM +0900, Junio C Hamano wrote:
> >
> >> I've dealt with the stray double-sign-off locally, but is there
> >> anything else planned for v4 or later? Is this performance-only
> >> change, or does
"Dr. Adam Nielsen" writes:
> If the pattern contains no slash "`/`"
> (except an optional trailing slash),
That's perfect.
> the pattern will match in all directories relative to
> the `.gitignore` file, with infinite depth.
Maybe it is just me but "in a
On 2019-04-09 09:34, Sven Strickroth wrote:
> Am 09.04.2019 um 07:53 schrieb Torsten Bögershausen:
>>> Regression was introduced in commit
>>> 25d90d1cb72ce51407324259516843406142fe89.
>>
>> Was it ?
>> 25d90d1cb merged this commit:
>> 1cadad6f6 (junio/tb/use-common-win32-pathfuncs-on-cygwin)
>
> Y
From: Christian Couder
This shows that it is now possible to fetch objects from more
than one promisor remote, and that fetching from a new
promisor remote can configure it as one.
Helped-by: SZEDER Gábor
Signed-off-by: Christian Couder
---
t/t0410-partial-clone.sh | 49 ++
As fetch_objects() is now used only in promisor-remote.c
and should't be used outside it, let's move it into
promisor-remote.c, make it static there, and remove
fetch-object.{c,h}.
Signed-off-by: Christian Couder
---
Makefile | 1 -
fetch-object.c| 43 --
Now that we can have a different default partial clone filter for
each promisor remote, let's hide core_partial_clone_filter_default
as a static in promisor-remote.c to avoid it being use for
anything other than managing backward compatibility.
Signed-off-by: Christian Couder
---
cache.h
Now that we have has_promisor_remote() and can use many
promisor remotes, let's hide repository_format_partial_clone
as a static in promisor-remote.c to avoid it being use
for anything other than managing backward compatibility.
Signed-off-by: Christian Couder
---
cache.h | 1 -
enviro
While at it, let's remove a reference to ODB effort as the ODB
effort has been replaced by directly enhancing partial clone
and promisor remote features.
Signed-off-by: Christian Couder
---
Documentation/technical/partial-clone.txt | 117 --
1 file changed, 84 insertions(+),
Signed-off-by: Christian Couder
---
Documentation/config/remote.txt | 8
1 file changed, 8 insertions(+)
diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt
index 6c4cad83a2..a8e6437a90 100644
--- a/Documentation/config/remote.txt
+++ b/Documentation/config/re
Let's not run a git command, especially one with "verify" in its
name, upstream of a pipe, because the pipe will hide the git
command's exit code.
While at it, let's also avoid a useless `cat` command piping
into `sed`.
Helped-by: SZEDER Gábor
Signed-off-by: Christian Couder
---
t/t0410-partia
From: Christian Couder
We will need to reinitialize the promisor remote configuration
as we will make some changes to it in a later commit.
Signed-off-by: Christian Couder
---
promisor-remote.c | 22 --
promisor-remote.h | 1 +
2 files changed, 21 insertions(+), 2 deletion
A remote specified using the extensions.partialClone config
option should be considered a promisor remote too.
For simplicity and to make things predictable, this promisor
remote should be either always the last one we try to get
objects from, or the first one. So it should always be either
at the
The repository_format_partial_clone global and fetch_objects()
should not be used anymore when there can be more than one
promisor remote. Instead let's use has_promisor_remote()
and promisor_remote_get_direct() from "promisor-remote.h".
This way all the configured promisor remotes will be taken
i
This makes it possible to specify a different partial clone
filter for each promisor remote.
Signed-off-by: Christian Couder
---
builtin/fetch.c | 2 +-
list-objects-filter-options.c | 27 +++
list-objects-filter-options.h | 3 ++-
promisor-remote.c
Instead of using the repository_format_partial_clone global
and fetch_objects() directly, let's use has_promisor_remote()
and promisor_remote_get_direct().
This way all the configured promisor remotes will be taken
into account, not only the one specified by
extensions.partialClone.
Also when clo
As the infrastructure for more than one promisor remote
has been introduced in previous patches, we can remove
code that forbids the registration of more than one
promisor remote.
Signed-off-by: Christian Couder
---
builtin/fetch.c | 20 +---
1 file changed, 5 insertions(+), 15 d
From: Christian Couder
The promisor-remote.{c,h} files will contain functions to
manage many promisor remotes.
We expect that there will not be a lot of promisor remotes,
so it is ok to use a simple linked list to manage them.
Helped-by: Jeff King
Helped-by: SZEDER Gábor
Signed-off-by: Christ
This patch series is based on:
763fb763b8 (Merge branch 'jt/batch-fetch-blobs-in-diff' into jch, 2019-04-08)
to avoid issues with jt/batch-fetch-blobs-in-diff.
Introduction
This path series is a follow up from the "remote odb" patch series
that I sent last year, which were a follow
From: Christian Couder
The callers of the fetch_object() and fetch_objects() might
be interested in knowing if these functions succeeded or not.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
fetch-object.c | 13 -
fetch-object.h | 4 ++--
sha1-file.c| 4 +
From: Christian Couder
This is implemented for now by calling fetch_objects(). It fetches
from all the promisor remotes.
Helped-by: Ramsay Jones
Signed-off-by: Christian Couder
---
promisor-remote.c | 66 +++
promisor-remote.h | 3 +++
2 files chan
On 4/2/2019 8:00 PM, Jonathan Nieder wrote:
Hi,
Jeff Hostetler via GitGitGadget wrote:
Teach git to read the system config (usually "/etc/gitconfig") for
default Trace2 settings. This allows system-wide Trace2 settings to
be installed and inherited to make it easier to manage a collection
Hi -
On 4/7/19 5:46 PM, mich...@platin.gs wrote:
From: Michael Platings
Hi Barret,
This is the updated fuzzy matching algorithm, sorry for the delay. It does
highlight a bug in the calculation for the number of lines ("int nr_parent_lines
= e->num_lines - delta;") - if you apply the patch, b
Jeff King writes:
> On Wed, Apr 10, 2019 at 12:14:41AM +0900, Junio C Hamano wrote:
>
>> I've dealt with the stray double-sign-off locally, but is there
>> anything else planned for v4 or later? Is this performance-only
>> change, or does it have an externally observable behaviour change
>> that
Plan to implement the project.
Objective:
Teach git stash to handle unmerged index entries.
Description:
When the index is unmerged, git stash refuses to do anything. That is
unnecessary, though, as it could easily craft e.g. an octopus merge of
the various stages. A subsequent git stash apply ca
Barret Rhoden writes:
> On 4/8/19 5:48 AM, Michael Platings wrote:
>> Hi David,
>> You also get an out-of-memory error with the patch Barret posted at
>> the start of this thread.
>
> I think I see the issue, and will fix it when I repost the patch set.
Thanks.
Jonathan Tan writes:
>> > Teach "clone" the same ability, except that because "clone" already
>> > has "-o" for another parameter, teach "clone" only to receive
>> > "--server-option".
>>
>> Can you give an example of what this would be used for? An example I
>> can think of might be
>>
>>
On Wed, Apr 10, 2019 at 12:14:41AM +0900, Junio C Hamano wrote:
> Josh Steadmon writes:
>
> > For large repositories, enumerating the list of all promisor objects (in
> > order to exclude them from a rev-list walk) can take a significant
> > amount of time).
> >
> > When --exclude-promisor-objec
On Wed, Apr 10, 2019 at 12:08:45AM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Fri, Apr 05, 2019 at 08:19:30PM +0100, Ramsay Jones wrote:
> >
> >> > /* global flag to enable extra checks when accessing packed objects */
> >> > -extern int do_check_packed_object_crc;
> >> > +int do
Josh Steadmon writes:
> For large repositories, enumerating the list of all promisor objects (in
> order to exclude them from a rev-list walk) can take a significant
> amount of time).
>
> When --exclude-promisor-objects is passed to rev-list, don't enumerate
> the promisor objects. Instead, filt
On Thu, Mar 14 2019, Eric Wong wrote:
> Jeff King wrote:
>> On Wed, Mar 13, 2019 at 01:51:33AM +, Eric Wong wrote:
>>
>> > But I did find Ævar's forgotten gitperformance doc and thread
>> > where the topic was brought up:
>> >
>> > https://public-inbox.org/git/20170403211644.26814-1-ava..
Jeff King writes:
> On Fri, Apr 05, 2019 at 08:19:30PM +0100, Ramsay Jones wrote:
>
>> > /* global flag to enable extra checks when accessing packed objects */
>> > -extern int do_check_packed_object_crc;
>> > +int do_check_packed_object_crc;
>>
>> ... removing this 'extern' on an int variable
When I perform a rebase and it stops at a commit due to a conflict,
the messages printed are very verbose. Example:
```
Applying: Delete run configuration for zPayServiceStandalone
Using index info to reconstruct a base tree...
A .idea/runConfigurations/zPayServiceStandalone.xml
Falling back
On Tue, Apr 09, 2019 at 06:43:41PM +0900, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > I'll leave it up to you if you want to queue just the test patch or drop
>
> As I said in a separate message, I think it is good to make sure
> that fsck does not crash. I do not think it is
> BOMPARD CORENTIN p1603631 writes:
>
>> Adding the --set-upstream option to git pull/fetch
>
> We usually write commit messages with imperative tone, hence "add", not
> "adding".
Fixed.
>> +/*
>> + * We want to set the current branch config following the
>> +
>> I agree with you. How about we make up the word "intermediate slash" and
>> explain it in an extra paragraph?
> I am not sure if that is any better than "in the following, pretend
> that a slash at the end of a pattern does not exist", which is how
> the current description avoids repetition an
(since 'git switch' is basically done, let's get back to 'git restore')
On Sun, Mar 10, 2019 at 1:27 AM Elijah Newren wrote:
>
> On Sat, Mar 9, 2019 at 4:16 AM Duy Nguyen wrote:
> > On Sat, Mar 9, 2019 at 1:01 AM Elijah Newren wrote:
>
> > > > +-q::
> > > > +--quiet::
> > > > + Quiet, sup
Just had a small discussion on irc about solving
https://git.github.io/SoC-2019-Ideas/#teach-git-stash-to-handle-unmerged-index-entries
the discussion:
https://colabti.org/irclogger/irclogger_log/git-devel?date=2019-04-09
Below are two approaches for solving this problem:
Approach 1) The suggeste
Sven Strickroth writes:
> A path such as 'c:/somepath/submodule/../.git/modules/submodule' wasn't
> resolved correctly any more, because the *nix variant of offset_1st_component
> is used instead of the Win32 specific version.
>
> Regression was introduced in commit 1cadad6f6 when mingw_offset_1s
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> In 6956f858f6 (notes: implement helpers needed for note copying during
> rewrite, 2010-03-12), we introduced a test case that verifies that the
> config setting `notes.rewriteRef` can be overridden via the environment
Nguyễn Thái Ngọc Duy writes:
> A new attribute "precious" is added to indicate that certain files
> have valuable content and should not be easily discarded even if they
> are ignored or untracked.
>
> So far there are one part of Git that are made aware of precious files:
s/are/is/g
> "git cl
A path such as 'c:/somepath/submodule/../.git/modules/submodule' wasn't
resolved correctly any more, because the *nix variant of offset_1st_component
is used instead of the Win32 specific version.
Regression was introduced in commit 1cadad6f6 when mingw_offset_1st_component
was moved from mingw.c
On Tue, Apr 9, 2019 at 3:16 PM Kapil Jain wrote:
>
> Reference:
> https://git.github.io/SoC-2019-Ideas/#teach-git-stash-to-handle-unmerged-index-entries
>
> "When the index is unmerged, git stash refuses to do anything. That is
> unnecessary, though, as it could easily craft e.g. an octopus merge
On Fri, Apr 05, 2019 at 04:26:10PM +0700, Duy Nguyen wrote:
> On Fri, Apr 5, 2019 at 12:25 AM SZEDER Gábor wrote:
> >
> > On Wed, Apr 03, 2019 at 06:34:26PM +0700, Nguyễn Thái Ngọc Duy wrote:
> > > Signed-off-by: Nguyễn Thái Ngọc Duy
> > > ---
> > > builtin/rebase.c | 5 ++---
> > > 1 file chang
It is always bad when test cases fail for the wrong reasons, but it is in
some ways more scary when they pass for the wrong reasons.
I stumbled over this issue while chasing down a Windows-specific issue that
caused two other test cases to fail, and should have caused this one to
fail, too, but di
From: Johannes Schindelin
In 6956f858f6 (notes: implement helpers needed for note copying during
rewrite, 2010-03-12), we introduced a test case that verifies that the
config setting `notes.rewriteRef` can be overridden via the environment
variable `GIT_NOTES_REWRITE_REF`.
Back when it was intro
A new attribute "precious" is added to indicate that certain files
have valuable content and should not be easily discarded even if they
are ignored or untracked.
So far there are one part of Git that are made aware of precious files:
"git clean" will leave precious files alone if --keep-precious
*** This is an automatically generated Email, please do not reply to this
message.
If you need to contact us, please send an Email to c...@reedexpo.co.jp ***
Request Accepted
We will process your request in a timely manner. However, please be noted that
it may take us a few days to complete th
尊敬的 市场经理
,
您好！
这里是日本国际促销礼品&营销展MARKETING & SALES PROMOTION EXPO展会主办方。
日本国际促销礼品&营销展是日本最大的针对促销及营销的专业BtoB展会。
贵司是否正在考虑以哪种方式将贵司产品打入日本市场？
在此我们强烈推荐您将贵司的文具作为促销礼品在日本销售。
为何作为促销礼品推广？
·日本促销礼品文化长久深厚，如产品包装、答谢礼品、杂志附录、宣传赠品、演唱会/动漫周边等在日本都属于促销礼品范畴。
·由于产品目的是用来赠送，客户在订购促销礼品时无需考虑在库风险，因此通常订购量会比正常礼品商品高许多。
·购买促销礼品的客户更多追
Bryan Turner writes:
> A question came up on Stack Overflow[1], and then again through our
> support channels, about "git push --atomic" and a behavior mismatch
> between HTTP(S) and SSH. I'm easily able to reproduce the behavior,
> but I don't see anything Bitbucket Server-related about how this
1 - 100 of 113 matches
Mail list logo
