On Wed, May 10, 2017 at 02:15:23PM -0500, Samuel Lijin wrote:
> On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist
> wrote:
> > Hi,
> >
> > After doing a subtree merge, using 'git log' and 'git log --follow' on
> > files in the subtree show only the merge commit in which they were
> > added.
> >
>
On Thu, May 11, 2017 at 02:35:49AM -0400, Jeff King wrote:
> > > After doing a subtree merge, using 'git log' and 'git log --follow' on
> > > files in the subtree show only the merge commit in which they were
> > > added.
> > >
> > > After reading around I understand that the issue is that git log
Nazri Ramliy writes:
> Otherwise it seems like I'll have to do "git submodule update" twice
> in order to update an already initialized submodule whose upstream
> repo url has been updated in .gitmodules to point to somewhere new,
I am not a heavy submodule user so what I think may not count, bu
On Wed, May 10, 2017 at 02:15:23PM -0500, Samuel Lijin wrote:
> On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist
> wrote:
> > Hi,
> >
> > After doing a subtree merge, using 'git log' and 'git log --follow' on
> > files in the subtree show only the merge commit in which they were
> > added.
> >
>
On Thu, May 11, 2017 at 02:26:16AM -0400, Jeff King wrote:
> > So whether this is a bug in the code or not it seems to definitely be
> > a doc bug, whatever it does with relative files should be in the docs.
>
> The includeIf variables should behave exactly as the documentation you
> quoted above
On Wed, May 10, 2017 at 09:48:05PM +0200, Ævar Arnfjörð Bjarmason wrote:
> In both cases the conditional is the same, but the path is relative
> v.s. absolute.
>
> Raphael: Does the config get included if you cd to
> ~/Work/git-repos/oss/? From git-config(1):
That shouldn't matter for relative p
Hi,
The command "git submodule update" accepts an "--init" flag to
initialize an uninitialized submodules.
Shouldn't it also accept "--sync" flag in order to sync and unsync'd submodule?
Otherwise it seems like I'll have to do "git submodule update" twice
in order to update an already initialize
Johannes Sixt writes:
> Am 11.05.2017 um 03:48 schrieb Junio C Hamano:
>> But perhaps you are right---it may be wrong for the contents of the
>> current index (or any index) to affect how a pathspec element is
>> parsed in the first place. If the current code (before this series)
>> uses the_ind
Am 11.05.2017 um 03:48 schrieb Junio C Hamano:
But perhaps you are right---it may be wrong for the contents of the
current index (or any index) to affect how a pathspec element is
parsed in the first place. If the current code (before this series)
uses the_index only for error checking, we may w
fb1bb965 ("read-tree: deprecate syntax without tree-ish args",
2010-09-10) wanted to deprecate "git read-tree" without any tree,
which used to be the way to empty the index, and encourage use of
"git read-tree --empty" instead.
However, when used with "-m", "--empty" does not make any sense,
eit
Jean-Noel Avila writes:
> git-filter-branch requires the specification of a branch by one way or
> another. If no branch appears to have been specified, we know the user
> got the usage wrong but we don't know what they were trying to do ---
> e.g. maybe they specified the ref to rewrite but in t
Jean-Noel Avila writes:
> "git read-tree -m" requires a tree argument to name the tree to be
> merged in. Git uses a cutesy error message to say so and why:
>
> $ git read-tree -m
> warning: read-tree: emptying the index with no arguments is
> deprecated; use --empty
> fatal: jus
Jean-Noel Avila writes:
> diff --git a/builtin/am.c b/builtin/am.c
> index a95dd8b4e..f5afa438d 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -1312,7 +1312,7 @@ static int parse_mail(struct am_state *state, const
> char *mail)
> }
>
> if (is_empty_file(am_path(state, "patch
Ævar Arnfjörð Bjarmason writes:
>> * ab/grep-pcre-v2 (2017-05-02) 19 commits
> ...
> This can just be ejected. ...
>
> * ab/grep-threading-cleanup (2017-04-16) 8 commits
> ...
> Can also be discarded, will re-send in a different form soon.
Will do and wait for replacements. Thanks.
Jacob Keller writes:
> On Wed, Apr 12, 2017 at 11:09 PM, Junio C Hamano wrote:
>> Jacob Keller writes:
>>
>>> Personally, I would want this to become the default and not have a new
>>> option to trigger it. I think we could also extend the porcelain
>>> format to include this information as wel
Ævar Arnfjörð Bjarmason writes:
> On Wed, May 10, 2017 at 7:18 AM, Junio C Hamano wrote:
>> [New Topics]
>>
>> * ab/compat-regex-update (2017-05-09) 2 commits
>> - compat/regex: update the gawk regex engine from upstream
>> - compat/regex: add a README with a maintenance guide
>>
>> Will merg
Torstem Bögershausen writes:
>> Am 10.05.2017 um 17:52 schrieb Johannes Schindelin
>> :
>>
>> ...
>> While at it, retire t0025: Recent "stress" tests show that t0025 if
>> flaky, reported by Lars Schneider , but all
>> tests in t0025 are covered by t0027 already.
>>
>> Signed-off-by: Torsten
Brandon Williams writes:
> ls-files is the only command (that I know of) which does cache pruning
> based on the common prefix of all pathspecs given. If there is a
> submodule named 'sub' and you provided a pathspec 'sub/', the matching
> logic can handle this but the cache pruning logic would
Jean-Noël AVILA writes:
> Le mercredi 10 mai 2017, 10:08:14 CEST Ævar Arnfjörð Bjarmason a écrit :
>> > * ja/doc-l10n (2017-03-20) 3 commits
>> > . SQUASH???
>> > . l10n: add git-add.txt to localized man pages
>> > . l10n: introduce framework for localizing man pages
>> >
>> > A proposal to u
Ævar Arnfjörð Bjarmason writes:
> On Thu, May 11, 2017 at 1:30 AM, Jonathan Nieder wrote:
>> Hi,
>>
>> Ęvar Arnfjörš Bjarmason wrote:
>>
>> [...]
>>> # call at least one of these to establish an appropriately-sized repository
>>> +test_perf_fresh_repo () {
>>> + repo="${1:-$TRASH_DIRECTORY}
Thanks for a quick report. Yes, that was a stupid mismerge.
Will correct in my rerere database X-<.
On Thu, May 11, 2017 at 1:30 AM, Jonathan Nieder wrote:
> Hi,
>
> Ęvar Arnfjörš Bjarmason wrote:
>
> [...]
>> # call at least one of these to establish an appropriately-sized repository
>> +test_perf_fresh_repo () {
>> + repo="${1:-$TRASH_DIRECTORY}"
>> + "$MODERN_GIT" init -q "$repo" &&
Hi,
Ævar Arnfjörð Bjarmason wrote:
> Add a test showing that ls-files times grow exponentially in the face
> of some pathological globs, whereas refglobs via for-each-ref don't in
> practice suffer from the same issue.
Cool.
[...]
> --- /dev/null
> +++ b/t/perf/p0100-globbing.sh
> @@ -0,0 +1,48
Hi,
Ævar Arnfjörð Bjarmason wrote:
[...]
> # call at least one of these to establish an appropriately-sized repository
> +test_perf_fresh_repo () {
> + repo="${1:-$TRASH_DIRECTORY}"
> + "$MODERN_GIT" init -q "$repo" &&
> + cd "$repo" &&
> + test_perf_do_repo_symlink_config_
> +}
Hi,
Jonathan Tan wrote:
> fetch-pack, when fetching a literal SHA-1 from a server that is not
> configured with uploadpack.allowtipsha1inwant (or similar), always
> returns an error message of the form "Server does not allow request for
> unadvertised object %s". However, it is sometimes the case
This is a re-send of <20170424211249.28553-1-ava...@gmail.com>
(https://public-inbox.org/git/20170424211249.28553-1-ava...@gmail.com/)
which fell through the cracks at the time.
The only change is a typo fix in the description of the test in 2/2.
Ævar Arnfjörð Bjarmason (2):
perf: add function
Add a function to setup a fresh test repo via 'git init' to compliment
the existing functions to copy over a normal & large repo.
Some performance tests don't need any existing repository data at all
to be significant, e.g. tests which stress glob matches against
revisions or files, which I'm abou
Add a test showing that ls-files times grow exponentially in the face
of some pathological globs, whereas refglobs via for-each-ref don't in
practice suffer from the same issue.
As noted in the test description this is a test to see whether Git
suffers from the issue noted in an article Russ Cox p
fetch-pack, when fetching a literal SHA-1 from a server that is not
configured with uploadpack.allowtipsha1inwant (or similar), always
returns an error message of the form "Server does not allow request for
unadvertised object %s". However, it is sometimes the case that such
object is advertised. T
> Am 10.05.2017 um 23:21 schrieb Raphael Stolt :
>
>>
>> Am 10.05.2017 um 21:48 schrieb Ævar Arnfjörð Bjarmason :
>>
>> On Wed, May 10, 2017 at 8:58 PM, Sebastian Schuberth
>> wrote:
>>> On 2017-05-10 19:00, raphael.st...@gmail.com wrote:
>>>
Current configuration which finds the conditi
>
> Am 10.05.2017 um 21:48 schrieb Ævar Arnfjörð Bjarmason :
>
> On Wed, May 10, 2017 at 8:58 PM, Sebastian Schuberth
> wrote:
>> On 2017-05-10 19:00, raphael.st...@gmail.com wrote:
>>
>>> Current configuration which finds the conditional configuration.
>>>
a)
>>> ~/.gitconfig
>>> [includeIf
The Git documentation in describing worktrees says that one reason
why you might want to lock a worktree is to prevent it from being pruned
if it is on a removable media that isn't currently mounted.
So, my expectation was that if the worktree is inaccessible (and locked), Git
would pretend that t
Ok for me, thanks for helping out.
> Am 10.05.2017 um 17:52 schrieb Johannes Schindelin
> :
>
> Hi,
>
>> On Wed, 10 May 2017, tbo...@web.de wrote:
>>
>> From: Torsten Bögershausen
>>
>> The purpose of t0027 is to test all CRLF related conversions at "git
>> checkout"
>> and "git add".
>>
On Wed, May 10, 2017 at 12:48 PM, Johannes Schindelin
wrote:
> Hi Stefan,
>
> On Fri, 5 May 2017, Johannes Schindelin wrote:
>
>> On Fri, 28 Apr 2017, Johannes Schindelin wrote:
>>
>> > On Fri, 28 Apr 2017, Stefan Beller wrote:
>> >
>> > > On Thu, Apr 27, 2017 at 3:50 PM, Johannes Schindelin
>> >
Hi Stefan,
On Fri, 5 May 2017, Johannes Schindelin wrote:
> On Fri, 28 Apr 2017, Johannes Schindelin wrote:
>
> > On Fri, 28 Apr 2017, Stefan Beller wrote:
> >
> > > On Thu, Apr 27, 2017 at 3:50 PM, Johannes Schindelin
> > > wrote:
> > >
> > > > I still have to find the time to figure out one
On Wed, May 10, 2017 at 8:58 PM, Sebastian Schuberth
wrote:
> On 2017-05-10 19:00, raphael.st...@gmail.com wrote:
>
>> Current configuration which finds the conditional configuration.
>>
>> ~/.gitconfig
>> [includeIf "gitdir:~/Work/git-repos/oss/"]
>>path = ~/Work/git-repos/oss/.oss-gitconfig
On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist
wrote:
> Hi,
>
> After doing a subtree merge, using 'git log' and 'git log --follow' on
> files in the subtree show only the merge commit in which they were
> added.
>
> After reading around I understand that the issue is that git log
> --follow doe
On 2017-05-10 19:00, raphael.st...@gmail.com wrote:
Current configuration which finds the conditional configuration.
~/.gitconfig
[includeIf "gitdir:~/Work/git-repos/oss/"]
path = ~/Work/git-repos/oss/.oss-gitconfig
Expected configuration which doesn't find the conditional configuration:
~
On 2017-05-10 19:00, Jonathan Nieder wrote:
Right, makes sense. I wondered if GitHub should be turning on
allowTipSHA1InWant, but it really doesn't make sense to. We _do_ hide
some internal refs[1], and they're things that users wouldn't want to
fetch. The problem for your case really is just o
On Wed, May 10, 2017 at 12:48:37PM -0600, Martin Fick wrote:
>> Ævar Arnfjörð Bjarmason wrote:
>>> Just a side question, what are the people who use this
>>> feature using it for? The only thing I can think of
>>> myself is some out of band ref advertisement because
>>> you've got squillions of re
On Wednesday, May 10, 2017 11:20:49 AM Jonathan Nieder
wrote:
> Hi,
>
> Ævar Arnfjörð Bjarmason wrote:
> > Just a side question, what are the people who use this
> > feature using it for? The only thing I can think of
> > myself is some out of band ref advertisement because
> > you've got squilli
Hi,
Ævar Arnfjörð Bjarmason wrote:
> Just a side question, what are the people who use this feature using
> it for? The only thing I can think of myself is some out of band ref
> advertisement because you've got squillions of refs as a hack around
> git's limitations in that area.
That's one use
Hi,
Jonathan Tan wrote:
> fetch-pack, when fetching a literal SHA-1 from a server that is not
> configured with uploadpack.allowtipsha1inwant (or similar), always
> returns an error message of the form "Server does not allow request for
> unadvertised object %s". However, it is sometimes the case
On Wed, May 10, 2017 at 6:46 AM, Mike Hommey wrote:
> On Wed, May 10, 2017 at 12:33:44AM -0400, Jeff King wrote:
>> On Tue, May 09, 2017 at 09:22:11PM -0700, Shawn Pearce wrote:
>>
>> > > Hmm. That makes sense generally, as the request should succeed. But it
>> > > seems like we're creating a clie
Igor Djordjevic writes:
[...] snipped detailed reply
[To Anyone who lands here on a search: Please read Igor D's full
answer in this thread... ]
> Just pay attention that untracked files are not affected, you still
> need to add them first to tell Git to start tracking them, including
> them
On 05/10, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > Convert 'parse_pathspec()' to take an index parameter.
> >
> > Since the index is only needed when the PATHSPEC_SUBMODULE_LEADING_PATH
> > and PATHSPEC_STRIP_SUBMODULE_SLASH flags are given, add a check
> > requiring a non-NULL inde
Hi,
Jeff King wrote:
> Right, makes sense. I wondered if GitHub should be turning on
> allowTipSHA1InWant, but it really doesn't make sense to. We _do_ hide
> some internal refs[1], and they're things that users wouldn't want to
> fetch. The problem for your case really is just on the client sid
Hi there,
I might have stumbled over a bug in includeIf / conditional includes or maybe
it's just as intended.
Current configuration which finds the conditional configuration.
~/.gitconfig
[includeIf "gitdir:~/Work/git-repos/oss/"]
path = ~/Work/git-repos/oss/.oss-gitconfig
Expected configur
fetch-pack, when fetching a literal SHA-1 from a server that is not
configured with uploadpack.allowtipsha1inwant (or similar), always
returns an error message of the form "Server does not allow request for
unadvertised object %s". However, it is sometimes the case that such
object is advertised. T
--
Did you receive my previous message about my donation to you?
On 05/10, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > It's confusing to have two different 'strip submodule slash' flags which
> > do subtly different things. Both
> > PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE and
> > PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP will accomplish the same task o
Hi Junio,
t6134 fails for me in 'pu', but I think it is just a question
of merge 641f3ad90a3 dropping the last line of the test from
the change introduced by commit bdab972153.
In other words, this fixes the test for me:
$ git diff
diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec
Hi,
On Wed, 10 May 2017, tbo...@web.de wrote:
> From: Torsten Bögershausen
>
> The purpose of t0027 is to test all CRLF related conversions at "git checkout"
> and "git add".
>
> Running t0027 under Git for Windows takes 3-4 minutes, so the whole script had
> been marked as "EXPENSIVE".
>
> T
Hi,
After doing a subtree merge, using 'git log' and 'git log --follow' on
files in the subtree show only the merge commit in which they were
added.
After reading around I understand that the issue is that git log
--follow doesn't track renames that occur during a merge.
Has there been any work
From: Torsten Bögershausen
The purpose of t0027 is to test all CRLF related conversions at "git checkout"
and "git add".
Running t0027 under Git for Windows takes 3-4 minutes, so the whole script had
been marked as "EXPENSIVE".
The source code for "Git for Windows" overrides this since 2014:
"t
Hi,
When a not-ignored file inside an ignore directory is added along with
other files, a false alarm is shown:
git init
echo /d/ > .gitignore
mkdir d
touch d/file foo
git add -f d/file foo
git add d/file
# fine
git add d/file foo
# The following paths are ignored by one of your .gitignore files:
On Wed, May 10, 2017 at 12:43 PM, Viresh Kumar wrote:
> On 10-05-17, 16:04, Viresh Kumar wrote:
>> On 10-05-17, 12:18, Ćvar Arnfjörđ Bjarmason wrote:
>> > On Wed, May 10, 2017 at 9:23 AM, Viresh Kumar
>> > wrote:
>> > > Hi,
>> > >
>> > > I have a use case and wanted help from you guys..
>> > >
>
Hi Junio,
On Wed, 10 May 2017, Junio C Hamano wrote:
> Ramsay Jones writes:
>
> > Yeah, I had a similar comment in the commit message (but much more
> > verbose than your concise addition above), but I edited it several
> > times, without finding a wording that I liked. I eventually removed
> >
On 10-05-17, 16:04, Viresh Kumar wrote:
> On 10-05-17, 12:18, Ævar Arnfjörð Bjarmason wrote:
> > On Wed, May 10, 2017 at 9:23 AM, Viresh Kumar
> > wrote:
> > > Hi,
> > >
> > > I have a use case and wanted help from you guys..
> > >
> > > I have set the sendemail.tocmd option in my kernel's .git/c
On 10 May 2017 at 12:59, Viresh Kumar wrote:
> On 10 May 2017 at 12:53, Viresh Kumar wrote:
>> Hi,
>>
>> I have a use case and wanted help from you guys..
>>
>> I have set the sendemail.tocmd option in my kernel's .git/config
>> file and that works very well. But sometimes I want to avoid that
>>
Hello!
I work at Canonical as part of the engineering team around Ubuntu and
Snapcraft [1].
We’re working on snaps, a platform to enable ISVs to directly control
delivery of software updates to their users, and make their software
available on many Linux distributions to a wide audience via our
s
On 10-05-17, 12:18, Ævar Arnfjörð Bjarmason wrote:
> On Wed, May 10, 2017 at 9:23 AM, Viresh Kumar wrote:
> > Hi,
> >
> > I have a use case and wanted help from you guys..
> >
> > I have set the sendemail.tocmd option in my kernel's .git/config
> > file and that works very well. But sometimes I wa
On Wed, May 10, 2017 at 9:23 AM, Viresh Kumar wrote:
> Hi,
>
> I have a use case and wanted help from you guys..
>
> I have set the sendemail.tocmd option in my kernel's .git/config
> file and that works very well. But sometimes I want to avoid that
> (for example sending the patch to someone with
Schönen Tag,
Ich bin Frau Ana Botin, die Vorsitzende von Santander Consumer Finance. Incase
Sie haben eine schlechte Kredit oder brauchen Geld, um Ihre Rechnungen und
Investitionen zu bezahlen, hier ist der richtige Ort, um finanziert werden.
Unser Zinssatz beträgt 3%.
Füllen Sie das untensteh
Le mercredi 10 mai 2017, 10:08:14 CEST Ævar Arnfjörð Bjarmason a écrit :
> > * ja/doc-l10n (2017-03-20) 3 commits
> > . SQUASH???
> > . l10n: add git-add.txt to localized man pages
> > . l10n: introduce framework for localizing man pages
> >
> > A proposal to use po4a to localize our manual pag
Dear Git users,
It is my pleasure to announce that Git for Windows 2.13.0 is available from:
https://git-for-windows.github.io/
Changes since Git for Windows v2.12.2(2) (April 5th 2017)
New Features
* Comes with Git v2.13.0.
* Comes with cURL v7.54.0.
* Comes with Git LFS v2.1.0.
On Wed, May 10, 2017 at 7:18 AM, Junio C Hamano wrote:
> [New Topics]
>
> * ab/compat-regex-update (2017-05-09) 2 commits
> - compat/regex: update the gawk regex engine from upstream
> - compat/regex: add a README with a maintenance guide
>
> Will merge to 'next'.
[Sent last E-Mail too soon]
On Wed, May 10, 2017 at 7:18 AM, Junio C Hamano wrote:
> * mg/status-in-progress-info (2017-04-14) 1 commit
> - status: show in-progress info for short status
>
> "git status" learns an option to report various operations
> (e.g. "merging") that the user is in the middle of.
>
> It is still u
On 10 May 2017 at 12:53, Viresh Kumar wrote:
> Hi,
>
> I have a use case and wanted help from you guys..
>
> I have set the sendemail.tocmd option in my kernel's .git/config
> file and that works very well. But sometimes I want to avoid that
> (for example sending the patch to someone without the
Hi,
I have a use case and wanted help from you guys..
I have set the sendemail.tocmd option in my kernel's .git/config
file and that works very well. But sometimes I want to avoid that
(for example sending the patch to someone without the list and
maintainers).
The suppress-cc=all option works q
70 matches
Mail list logo