On Thu, Dec 15, 2016 at 01:29:47PM -0800, Linus Torvalds wrote:
> On Tue, Oct 11, 2016 at 11:45 AM, Linus Torvalds
> wrote:
> > In some situations you may want to group the commits not by author,
> > but by committer instead.
> >
> > For example, when I just wanted to look up what I'm still missi
On Fri, Dec 16, 2016 at 08:39:40AM -0500, Jeff King wrote:
> I'm OK with the approach your patch takes, but I think there were some
> unresolved issues:
>
> - are we OK taking the short "-c" for this, or do we want
> "--group-by=committer" or something like it?
>
> - no tests; you can st
On Thu, Dec 15, 2016 at 08:14:58PM +, Larry Minton wrote:
> My question:
>
> Let's say I have a code change that I want to 'bake' for a while
> locally, just to make sure some edge case doesn't pop up while I am
> working on other things. Is there any practical way of doing that? I
> could c
Hi all,
We're occasionally seeing a lot of
error: cannot lock ref 'stash-refs/pull-requests/18978/to': Unable to create
'/opt/apps//repositories/68/stash-refs/pull-requests/18978/to.lock': File
exists.
from the server side with fetches as well as pushes. (Bitbucket server.)
What I find
Andreas Krey writes:
> We're occasionally seeing a lot of
>
> error: cannot lock ref 'stash-refs/pull-requests/18978/to': Unable to
> create
> '/opt/apps//repositories/68/stash-refs/pull-requests/18978/to.lock': File
> exists.
>
> from the server side with fetches as well as pushes. (Bi
Jeff King writes:
> It obviously would need updating if we switch away from "-c", but I
> think I am OK with the short "-c" (even if we add a more exotic grouping
> option later, this can remain as a short synonym).
Yeah, I think it probably is OK.
As it is very clear that "group by author" i
Am 11.12.2016 um 12:16 schrieb Johannes Schindelin:
When Git's source code calls isatty(), it really asks whether the
respective file descriptor is connected to an interactive terminal.
Windows' _isatty() function, however, determines whether the file
descriptor is associated with a character de
Eric Wong writes:
> Jeff King wrote:
> ...
>> Yes, the status of gmane was up in the air for a while, but I think we
>> can give it up as dead now (at least for our purposes).
>
> s/http/nntp/ still works for gmane.
> ...
>> -- >8 --
>> Subject: README: replace gmane link with public-inbox
> ...
Junio C Hamano writes:
> Jeff King writes:
>
>> On Thu, Dec 15, 2016 at 08:37:28PM -0500, Jeff King wrote:
>>
>>> But if this case really is just "if (from_stdin)" that's quite easy,
>>> too.
>>
>> So here is that patch (with some associated refactoring and cleanups).
>> This is conceptually ind
Jeff King writes:
> On Thu, Dec 15, 2016 at 08:37:28PM -0500, Jeff King wrote:
>
>> But if this case really is just "if (from_stdin)" that's quite easy,
>> too.
>
> So here is that patch (with some associated refactoring and cleanups).
> This is conceptually independent of
> jk/no-looking-at-dot
Junio C Hamano writes:
> Junio C Hamano writes:
>
>> Jeff King writes:
>>
>>> On Thu, Dec 15, 2016 at 08:37:28PM -0500, Jeff King wrote:
>>>
But if this case really is just "if (from_stdin)" that's quite easy,
too.
>>>
>>> So here is that patch (with some associated refactoring and cl
Johannes Sixt writes:
> Am 11.12.2016 um 12:16 schrieb Johannes Schindelin:
>> When Git's source code calls isatty(), it really asks whether the
>> respective file descriptor is connected to an interactive terminal.
>> ...
>> +if (!GetConsoleScreenBufferInfo(handle, &dummy))
>
I am using git with a simple in-memory FUSE filesystem. When I enable
direct_io, I get a segfault from
git_config_set_multivar_in_file_gently during git clone.
I have full reproduction instructions using Go and macOS at
https://github.com/josharian/gitbug. It also includes a stack trace in
case an
Chris Packham writes:
> -CPPCHECK_FLAGS = --force --quiet --inline-suppr $(if
> $(CPPCHECK_ADD),--enable=$(CPPCHECK_ADD))
> +CPPCHECK_SUPP = --suppressions-list=nedmalloc.supp \
> + --suppressions-list=regcomp.supp
> +
> +CPPCHECK_FLAGS = --force --quiet --inline-suppr \
> + $(if $(CPPCH
Am 16.12.2016 um 19:08 schrieb Junio C Hamano:
Sorry for not having waited for you to chime in before agreeing to
fast-track this one, and now this is in 'master'.
No reason to be sorry, things happen... Dscho's request for
fast-tracking was very reasonable, and the patch looked "obviously
co
Junio C Hamano writes:
> Jeff King writes:
> ...
>> I'm actually wondering if the way it calls die() in 'next' is a pretty
>> reasonable way for things to work in general. It happens when we lazily
>> try to ask for the repository directory. So we don't have to replicate
>> logic to say "are we
Hey Stephan,
On Wed, Dec 7, 2016 at 1:03 AM, Pranit Bauva wrote:
>> I don't understand why the return value is int and not void. To avoid a
>> "return 0;" line when calling this function?
>
> Initially I thought I would be using the return value but now I
> realize that it is meaningless to do s
Add the `is_submodule_initialized()` helper function to submodules.c.
`is_submodule_initialized()` performs a check to determine if the
submodule at the given path has been initialized.
Signed-off-by: Brandon Williams
---
submodule.c | 23 +++
submodule.h | 1 +
2 files chan
Changes in v7:
* Rebased on 'origin/bw/realpath-wo-chdir' in order to fix the race condition
that occurs when verifying a submodule's gitdir.
* Reverted is_submodule_populated() to use resolve_gitdir() now that there is
no race condition.
* Added !MINGW to a test in t7814 so that it won't run o
teach submodules to load a '.gitmodules' file from a commit sha1. This
enables the population of the submodule_cache to be based on the state
of the '.gitmodules' file from a particular commit.
Signed-off-by: Brandon Williams
---
cache.h| 2 ++
config.c | 8
sub
Allow grep to recognize submodules and recursively search for patterns in
each submodule. This is done by forking off a process to recursively
call grep on each submodule. The top level --super-prefix option is
used to pass a path to the submodule which can in turn be used to
prepend to output or
Add `GREP_SOURCE_SUBMODULE` as a grep_source type and cases for this new
type in the various switch statements in grep.c.
When initializing a grep_source with type `GREP_SOURCE_SUBMODULE` the
identifier can either be NULL (to indicate that the working tree will be
used) or a SHA1 (the REV of the s
Teach grep to recursively search in submodules when provided with a
object. This allows grep to search a submodule based on the state
of the submodule that is present in a commit of the super project.
When grep is provided with a object, the name of the object is
prefixed to all output. In orde
If a submodule was renamed at any point since it's inception then if you
were to try and grep on a commit prior to the submodule being moved, you
wouldn't be able to find a working directory for the submodule since the
path in the past is different from the current path.
This patch teaches grep to
Add the `is_submodule_populated()` helper function to submodules.c.
`is_submodule_populated()` performes a check to see if a submodule has
been checkout out (and has a valid .git directory/file) at the given path.
Signed-off-by: Brandon Williams
---
submodule.c | 15 +++
submodule.h
Johannes Sixt writes:
> Am 16.12.2016 um 19:08 schrieb Junio C Hamano:
>> Sorry for not having waited for you to chime in before agreeing to
>> fast-track this one, and now this is in 'master'.
>
> No reason to be sorry, things happen... Dscho's request for
> fast-tracking was very reasonable, an
Johannes Schindelin writes:
> An interactive rebase operates on a detached HEAD (to keep the reflog
> of the original branch relatively clean), and updates the branch only
> at the end.
>
> Now that the sequencer learns to perform interactive rebases, it also
> needs to learn the trick to update
Johannes Schindelin writes:
> When doing an interactive rebase, we want to leave a 'patch' file for
> further inspection by the user (even if we never tried to actually apply
> that patch, since we're cherry-picking instead).
>
> Signed-off-by: Johannes Schindelin
> ---
Yup.
The other day, I
Johannes Schindelin writes:
> The scripted version of the interactive rebase already does that.
Sensible. I was wondering why this wasn't there while reviewing
10/34, comparing the two (this is not a suggestion to squash this
into the previous step).
>
> Signed-off-by: Johannes Schindelin
> -
Johannes Schindelin writes:
> This makes the code DRYer, with the obvious benefit that we can enhance
> the code further in a single place.
>
> We can also reuse the functionality elsewhere by calling this new
> function.
>
> Signed-off-by: Johannes Schindelin
> ---
> sequencer.c | 33 +
Hey Stephan,
On Thu, Nov 17, 2016 at 5:17 AM, Stephan Beyer wrote:
> Hi,
>
> On 10/14/2016 04:14 PM, Pranit Bauva wrote:
>> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
>> index d84ba86..c542e8b 100644
>> --- a/builtin/bisect--helper.c
>> +++ b/builtin/bisect--helper.c
>> @@ -
Johannes Schindelin writes:
> +static void flush_rewritten_pending(void) {
> + struct strbuf buf = STRBUF_INIT;
> + unsigned char newsha1[20];
> + FILE *out;
> +
> + if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), 82) > 0 &&
> + !get_sha1("HEAD", ne
Hello,
I'M Anessa female 25 years old single, I am contacting you because I will be
relocating to your country.
I will send you my photos soon as i hear from you and also tell you much about
my self.
Thanks.
Sincerely yours
Anessa.
Hi Lars,
For the last two days, I've noticed t0021.15 on the 'pu' branch has been
failing intermittently (well it fails with: 'make test >ptest-out', but
when run by hand, it fails only say 1-in-6, 1-in-18, etc.).
[yes, it's a bit strange; this hasn't changed in a couple of weeks!]
I don't have
I'm a bit confused by the message "disabling bitmap writing, as some
objects are not being packed". I see it the my gc.log file on my git
server.
1. Its presence in the gc.log file prevents future automatic garbage
collection. This seems bad. I understand the desire to avoid making
things worse
Hello,
I'M Anessa female 25 years old single, I am contacting you because I will be
relocating to your country.
I will send you my photos soon as i hear from you and also tell you much about
my self.
Thanks.
Sincerely yours
Anessa.
On Fri, Dec 16, 2016 at 04:05:31PM -0500, David Turner wrote:
> 1. Its presence in the gc.log file prevents future automatic garbage
> collection. This seems bad. I understand the desire to avoid making
> things worse if a past gc has run into issues. But this warning is
> non-fatal; the only c
David Turner writes:
> I'm a bit confused by the message "disabling bitmap writing, as some
> objects are not being packed". I see it the my gc.log file on my git
> server.
> 1. Its presence in the gc.log file prevents future automatic garbage
> collection. This seems bad. I understand the de
On Fri, Dec 16, 2016 at 01:28:00PM -0800, Junio C Hamano wrote:
> > 2. I don't understand what would cause that message. That is, what bad
> > thing am I doing that I should stop doing? I've briefly skimmed the
> > code and commit message, but the answer isn't leaping out at me.
>
> Enabling bi
On Fri, 2016-12-16 at 16:32 -0500, Jeff King wrote:
> On Fri, Dec 16, 2016 at 01:28:00PM -0800, Junio C Hamano wrote:
>
> > > 2. I don't understand what would cause that message. That is, what bad
> > > thing am I doing that I should stop doing? I've briefly skimmed the
> > > code and commit mes
Brandon Williams writes:
> Changes in v7:
> * Rebased on 'origin/bw/realpath-wo-chdir' in order to fix the race condition
> that occurs when verifying a submodule's gitdir.
> * Reverted is_submodule_populated() to use resolve_gitdir() now that there is
> no race condition.
> * Added !MINGW to
On Fri, Dec 16, 2016 at 10:01:49AM -0800, Junio C Hamano wrote:
> >> I think 2/3 is a good change to ensure we get a reasonable error for
> >> "index-pack --stdin", and 3/3 is a very good cleanup. Both of them
> >> of course are enabled by 1/3.
> >>
> >> We still fail "nongit git index-pack tmp.p
On Fri, Dec 16, 2016 at 10:54:13AM -0800, Junio C Hamano wrote:
> I am tempted to suggest an intermediate step that comes before
> b1ef400eec ("setup_git_env: avoid blind fall-back to ".git"",
> 2016-10-20), which is the attached, and publish that as part of an
> official release. That way, we'll
On Fri, Dec 16, 2016 at 04:40:16PM -0500, David Turner wrote:
> I would assume, based on the documentation, that auto gc would be doing
> an all-into-one repack:
> "If the number of packs exceeds the value of gc.autopacklimit, then
> existing packs (except those marked with a .keep file) are
> c
Jeff King writes:
> Ah, I only checked that it did not do anything terrible like write into
> ".git". But it looks like it still looks at the git_dir value as part of
> the collision check.
>
> Here's a patch, on top of the rest of the series.
Thanks for a quick turnaround, as always.
> -- >8 -
On Fri, Dec 16, 2016 at 10:43:48AM -0800, Junio C Hamano wrote:
> > diff --git a/nedmalloc.supp b/nedmalloc.supp
> [...]
> > diff --git a/regcomp.supp b/regcomp.supp
>
> Yuck for both files for multiple reasons.
>
> I do not think it is a good idea to allow these files to clutter the
> top-level
Andreas,
Bitbucket Server developer here. Typically these errors on your client
are indicative of git gc --auto being triggered by git-receive-pack on
the server. Auto GC directly attached to a push in a repository with
pull requests often fails due to concurrent ref updates linked to
background p
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.
You can find the changes described
When running git pack-objects --incremental, we do not expect to be
able to write a bitmap; it is very likely that objects in the new pack
will have references to objects outside of the pack. So we don't need
to warn the user about it.
This warning was making its way into gc.log because auto-gc w
Hi,
I started using compaction-heuristic with 2.9, and then also (or so I
thought) enabled indent-heuristic with 2.11.
Only after reading a comment in "Git rev news" I realized that these 2
options are mutually exclusive. I then
checked the Git source code and saw that Git first checks the new
in
On Fri, Dec 16, 2016 at 4:28 PM, Norbert Kiesel wrote:
> Hi,
>
> I started using compaction-heuristic with 2.9, and then also (or so I
> thought) enabled indent-heuristic with 2.11.
> Only after reading a comment in "Git rev news" I realized that these 2
> options are mutually exclusive. I then
>
On Fri, Dec 16, 2016 at 4:28 PM, Norbert Kiesel wrote:
> Hi,
>
> I started using compaction-heuristic with 2.9, and then also (or so I
> thought) enabled indent-heuristic with 2.11.
> Only after reading a comment in "Git rev news" I realized that these 2
> options are mutually exclusive. I then
>
On Fri, Dec 16, 2016 at 4:44 PM, Jacob Keller wrote:
> On Fri, Dec 16, 2016 at 4:28 PM, Norbert Kiesel wrote:
>> Hi,
>>
>> I started using compaction-heuristic with 2.9, and then also (or so I
>> thought) enabled indent-heuristic with 2.11.
>> Only after reading a comment in "Git rev news" I real
On 15 December 2016 at 17:14, George Vanburgh wrote:
> From: George Vanburgh
>
> When importing from multiple perforce paths - we may attempt to import a
> changelist that contains files from two (or more) of these depot paths.
> Currently, this results in multiple git commits - one containing
From: Jacob Keller
The current configuration code for enabling experimental heuristics
prefers the last-set heuristic in the configuration. However, it is not
necessarily easy to see what order the configuration will be read. This
means that it is possible for a user to have accidentally enabled
When submitting to P4, if git-p4 came across a symlinked
directory, then during the generation of the submit diff, it would
try to open it as a normal file and fail.
Spot symlinks (of any type) and output a description of the symlink
instead.
Add a test case.
Signed-off-by: Luke Diamand
---
gi
This is an updated version of my earlier git-p4 symlink fix.
This one now treats addition of all symlinks in the same way,
rather than displaying the target file if linking to a file,
or just the link target name if it's a directory.
That makes the git-p4 summary behave more like normal git
comma
From: Jacob Keller
Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper",
2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated
list of strings. However, this was not documented in the
api-parse-options documentation. Add documentation now so that future
developers ma
From: Jacob Keller
This series adds support for extending describe and name-rev pattern
matching to allow (a) taking multiple patterns and (b) negative patterns
which discard instead of keep. These changes increase the flexibility of
the describe mechanism so that searching for specific tag forma
From: Jacob Keller
Teach git name-rev to take a string list of patterns from --refs instead
of only a single pattern. The list of patterns will be matched
inclusively, such that a ref only needs to match one pattern to be
included. If a ref will only be excluded if it does not match any of the
pa
From: Jacob Keller
Extend name-rev further to support matching refs by adding `--discard`
patterns. These patterns will limit the scope of refs by discarding any
ref that matches at least one discard pattern. Checking the discard refs
shall happen first, before checking the include --refs pattern
From: Jacob Keller
Teach `--match` to be accepted multiple times, accumulating a list of
patterns to match into a string list. Each pattern is inclusive, such
that a tag need only match one of the provided patterns to be
considered for matching.
This extension is useful as it enables more flexib
From: Jacob Keller
Teach git-describe the `--discard` option which will allow specifying
a glob pattern of tags to ignore. This can be combined with the
`--match` patterns to enable more flexibility in determining which tags
to consider.
For example, suppose you wish to find the first official r
Jacob Keller writes:
> From: Jacob Keller
>
> The current configuration code for enabling experimental heuristics
> prefers the last-set heuristic in the configuration. However, it is not
> necessarily easy to see what order the configuration will be read. This
> means that it is possible for a
On 17 December 2016 01:47:55 CET, Luke Diamand wrote:
>On 15 December 2016 at 17:14, George Vanburgh
>wrote:
>> From: George Vanburgh
>>
>> When importing from multiple perforce paths - we may attempt to
>import a changelist that contains files from two (or more) of these
>depot paths. Current
On Fri, Dec 16, 2016 at 06:59:35PM -0500, David Turner wrote:
> When running git pack-objects --incremental, we do not expect to be
> able to write a bitmap; it is very likely that objects in the new pack
> will have references to objects outside of the pack. So we don't need
> to warn the user a
On Fri, Dec 16, 2016 at 9:28 PM, Lars Schneider
wrote:
>
> On 14 Dec 2016, at 12:24, Jeff King wrote:
>
> On Wed, Dec 14, 2016 at 10:27:31PM +1300, Chris Packham wrote:
>
> Changes in v2:
>
> - only run over actual git source files.
>
> - omit any files in t/
>
>
> I actually wonder if FIND_SOURC
On Sat, Dec 17, 2016 at 4:28 AM, Junio C Hamano wrote:
> David Turner writes:
>
>> I'm a bit confused by the message "disabling bitmap writing, as some
>> objects are not being packed". I see it the my gc.log file on my git
>> server.
>
>> 1. Its presence in the gc.log file prevents future autom
On Wed, Dec 14, 2016 at 1:08 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> At least attr has the same problem and is going the same direction
>> [1]. Cool. (I actually thought the patch was in and evidence that this
>> kind of backward compatibility breaking was ok, turns out the patch
>> h
69 matches
Mail list logo
