On Wed, Dec 28, 2016 at 02:23:03AM -0500, Jeff King wrote:
> That's a lot of time not using any CPU. What's going on? Running with
> "sh -x" shows that we spend most of the time in this line from
> lib-gpg.sh:
>
> gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
> "$TEST_DIRECTORY"/l
On Wed, Dec 28, 2016 at 2:34 AM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> +symref::
>> + The ref which the given symbolic ref refers to. If not a
>> + symbolic ref, nothing is printed. Respects the `:short` and
>> + `:strip` options in the same way as `refname` above.
>> +
>
On Wed, Dec 28, 2016 at 03:02:30AM -0500, Jeff King wrote:
> > Is it a bug in gpg (oddly, the kernel reports lots of entropy available,
> > and generating the signatures themselves is quite fast)? Or is the new
> > version doing something special in the import process that we need to
> > work arou
Thanks; your point is taken. One final wrinkle:
This project is hosted on github. If I put the hook into the repository
manually (if I can; I don't know that), is it true that the hook would
be distributed on a clone action, but not on a pull?
j.
On 28/12/16 06:08, Jeff King wrote:
On Wed, Dec 28, 2016 at 08:42:25AM +, John P. Hartmann wrote:
> This project is hosted on github. If I put the hook into the repository
> manually (if I can; I don't know that), is it true that the hook would be
> distributed on a clone action, but not on a pull?
I'm not sure what you mean b
On Wed, Dec 28, 2016 at 2:41 AM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> Currently the 'lstrip=' option only takes a positive value ''
>> and strips '' slash-separated path components from the left. Modify
>> the 'lstrip' option to also take a negative number '' which would
>> only _le
Thanks, Peff, for your lucid answer to my question and much more. All
is now clear to me.
The problem I am grappling with is how to obtain the latest git commit
hash and enter it into the generated code. Configure/make would appear
to the the time, but by then the user may not have git insta
On Wed, Dec 28, 2016 at 09:09:04AM +, John P. Hartmann wrote:
> The problem I am grappling with is how to obtain the latest git commit hash
> and enter it into the generated code. Configure/make would appear to the
> the time, but by then the user may not have git installed (e.g., extracted
>
On Wed, Dec 28, 2016 at 2:47 AM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> static char branch_colors[][COLOR_MAXLEN] = {
>> - GIT_COLOR_RESET,
>> - GIT_COLOR_NORMAL, /* PLAIN */
>> - GIT_COLOR_RED, /* REMOTE */
>> - GIT_COLOR_NORMAL, /* LOCAL */
>> -
I suppose this is some bug. Because `Segmentation fault` is not expected in any
case
http://stackoverflow.com/questions/41362676/how-to-resolve-merge-conflict-while-rebasing
Every once in a while someone complains to the mailing list to have
run into this weird assertion[1].
The usual response from the mailing list is link to old discussions[2],
and acknowledging the problem stating it is known.
For now just improve the user visible error message.
[1] https://www.go
On Wed, Dec 28, 2016 at 03:39:30AM -0500, Jeff King wrote:
> >
> > https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=4473db1ef24031ff4e26c9a9de95dbe898ed2b97
> >
> > So this does seem like a gpg bug.
>
> I've submitted a bug report to gpg:
>
> https://bugs.gnupg.org/gnupg/issu
gitview did not have meaningful contributions since 2007, which gives the
impression it is either a mature or dead project.
In both cases we should not carry it in git.git as the README for contrib
states we only want to carry experimental things to give early exposure.
Recently a security vulner
git-am has options to enable --message-id and --3way by default,
but no option to enable --signoff by default. Add a "am.signoff"
config option.
Signed-off-by: Eduardo Habkost
---
builtin/am.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/builtin/am.c b/builtin/am.c
index 31fb605..d2e023
On Wed, Dec 28, 2016 at 9:40 AM, Eduardo Habkost wrote:
> git-am has options to enable --message-id and --3way by default,
> but no option to enable --signoff by default. Add a "am.signoff"
> config option.
I think this is a good idea (from a design standpoint and what the user needs).
Just like
On Wed, Dec 28, 2016 at 09:45:24AM -0800, Stefan Beller wrote:
> On Wed, Dec 28, 2016 at 9:40 AM, Eduardo Habkost wrote:
> > git-am has options to enable --message-id and --3way by default,
> > but no option to enable --signoff by default. Add a "am.signoff"
> > config option.
>
> I think this is
git-convert-objects, originally named git-convert-cache was used in
early 2005 to convert to a new repository format, e.g. adding an author
date.
By now the need for conversion of the very early repositories is less
relevant, we no longer need to keep it in contrib; remove it.
Signed-off-by: Stef
When git gc --auto does an incremental repack of loose objects, 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 shouldn't try to write a bitmap, because doing so will
likely issue a warning.
T
The bitmap index only works for single packs, so requesting an
incremental repack with bitmap indexes makes no sense.
Signed-off-by: David Turner
---
builtin/repack.c| 9 +
t/t5310-pack-bitmaps.sh | 8 +++-
t/t6500-gc.sh | 8
3 files changed, 16 insertions(
On 12/27, Stefan Beller wrote:
> Every once in a while someone complains to the mailing list to have
> run into this weird assertion[1].
>
> The usual response from the mailing list is link to old discussions[2],
> and acknowledging the problem stating it is known.
>
> For now just improve the us
On 12/28, Stefan Beller wrote:
> Every once in a while someone complains to the mailing list to have
> run into this weird assertion[1].
>
> The usual response from the mailing list is link to old discussions[2],
> and acknowledging the problem stating it is known.
>
> For now just improve the us
On 12/27, Junio C Hamano wrote:
> * bw/pathspec-cleanup (2016-12-14) 16 commits
> - pathspec: rename prefix_pathspec to init_pathspec_item
> - pathspec: small readability changes
> - pathspec: create strip submodule slash helpers
> - pathspec: create parse_element_magic helper
> - pathspec: cr
git-am has options to enable --message-id and --3way by default,
but no option to enable --signoff by default. Add a "am.signoff"
config option.
Signed-off-by: Eduardo Habkost
---
Changes v1 -> v2:
* Added documentation to Documentation/git-am.txt and
Documentation/config.txt
* Added test cases
On Wed, Dec 28, 2016 at 10:35 AM, Eduardo Habkost wrote:
> git-am has options to enable --message-id and --3way by default,
> but no option to enable --signoff by default. Add a "am.signoff"
> config option.
>
> Signed-off-by: Eduardo Habkost
> ---
> Changes v1 -> v2:
> * Added documentation to D
On Tue, Dec 27, 2016 at 10:08 PM, Jeff King wrote:
>
>https://github.com/Autodesk/enterprise-config-for-git
>
> (with the disclaimer that I've never used it myself, so I have no
> idea how good it is).
>
> I think you probably know all that, Jake, but I am laying it out for the
>
On Dez 28 2016, Eduardo Habkost wrote:
> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
> index 12879e402..f22f10d40 100644
> --- a/Documentation/git-am.txt
> +++ b/Documentation/git-am.txt
> @@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox
> SYNOPSIS
> --
On Wed, Dec 28, 2016 at 10:51:28AM -0800, Stefan Beller wrote:
> On Wed, Dec 28, 2016 at 10:35 AM, Eduardo Habkost wrote:
> > git-am has options to enable --message-id and --3way by default,
> > but no option to enable --signoff by default. Add a "am.signoff"
> > config option.
> >
> > Signed-off-
On Wed, Dec 28, 2016 at 08:07:54PM +0100, Andreas Schwab wrote:
> On Dez 28 2016, Eduardo Habkost wrote:
>
> > diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
> > index 12879e402..f22f10d40 100644
> > --- a/Documentation/git-am.txt
> > +++ b/Documentation/git-am.txt
> > @@ -9,7 +
On Wed, Dec 28, 2016 at 05:11:42PM -0200, Eduardo Habkost wrote:
> On Wed, Dec 28, 2016 at 10:51:28AM -0800, Stefan Beller wrote:
> > On Wed, Dec 28, 2016 at 10:35 AM, Eduardo Habkost
> > wrote:
[...]
> > > + test $(git cat-file commit HEAD | grep -c "Signed-off-by:") -eq 0
> >
> > and the
On Wed, Dec 28, 2016 at 11:19 AM, Eduardo Habkost wrote:
> On Wed, Dec 28, 2016 at 05:11:42PM -0200, Eduardo Habkost wrote:
>> On Wed, Dec 28, 2016 at 10:51:28AM -0800, Stefan Beller wrote:
>> > On Wed, Dec 28, 2016 at 10:35 AM, Eduardo Habkost
>> > wrote:
> [...]
>> > > + test $(git cat-f
Dear Stefan,
Thank you for commenting on my report and getting the ball rolling on this.
This response sounds good to me.
Regards,
Javantea
On Wed, 28 Dec 2016 09:28:37 -0800, Stefan Beller wrote:
>gitview did not have meaningful contributions since 2007, which gives the
>impression it is eith
Am 28.12.2016 um 19:12 schrieb David Turner:
+static const char incremental_bitmap_conflict_error[] = N_(
+"Incremental repacks are incompatible with bitmap indexes. Use \n"
The SP before LF could be removed.
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+);
Th
This version addresses Johannes Sixt's comments on v4. Also, I
messed up the rebase on v4.
David Turner (2):
auto gc: don't write bitmaps for incremental repacks
repack: die on incremental + write-bitmap-index
builtin/gc.c| 9 -
builtin/repack.c| 9 +
t
When git gc --auto does an incremental repack of loose objects, 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 shouldn't try to write a bitmap, because doing so will
likely issue a warning.
T
The bitmap index only works for single packs, so requesting an
incremental repack with bitmap indexes makes no sense.
Signed-off-by: David Turner
---
builtin/repack.c| 9 +
t/t5310-pack-bitmaps.sh | 8 +++-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/built
git-am has options to enable --message-id and --3way by default,
but no option to enable --signoff by default. Add a "am.signoff"
config option.
Signed-off-by: Eduardo Habkost
---
Changes v1 -> v2:
* Added documentation to Documentation/git-am.txt and
Documentation/config.txt
* Added test cases
The checkout state was introduced via 16da134b1f9
(read-trees: refactor the unpack_trees() part, 2006-07-30). An attempt to
refactor the checkout state was done in b56aa5b268e (unpack-trees: pass
checkout state explicitly to check_updates(), 2016-09-13), but we can
go even further.
The `struct che
On Wed, Dec 28, 2016 at 09:28:37AM -0800, Stefan Beller wrote:
> gitview did not have meaningful contributions since 2007, which gives the
> impression it is either a mature or dead project.
>
> In both cases we should not carry it in git.git as the README for contrib
> states we only want to car
On Wed, Dec 28, 2016 at 05:45:40PM -0500, David Turner wrote:
> This version addresses Johannes Sixt's comments on v4. Also, I
> messed up the rebase on v4.
Thanks. The test logic in this one looks good to me.
-Peff
On Dez 28 2016, Eduardo Habkost wrote:
> @@ -32,10 +32,12 @@ OPTIONS
> If you supply directories, they will be treated as Maildirs.
>
> -s::
> ---signoff::
> +--[no-]-signoff::
That's one dash too much.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7
40 matches
Mail list logo
