Re: [bug] assertion in 2.8.4 triggering on old-ish worktree

On Thu, Jun 16, 2016 at 4:59 PM, Chris Packham wrote: > Hi All, > > I have the git-sh-prompt configured in my .bashrc today I visited an > old worktree that I haven't really touched in a few years (sorry can't > remember the git version I was using back then). I received the > following output whe

[bug] assertion in 2.8.4 triggering on old-ish worktree

Hi All, I have the git-sh-prompt configured in my .bashrc today I visited an old worktree that I haven't really touched in a few years (sorry can't remember the git version I was using back then). I received the following output when changing to the directory git: pathspec.c:317: prefix_pathspec:

[no subject]

w -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] archive-tar: write extended headers for far-future mtime

The ustar format represents timestamps as seconds since the epoch, but only has room to store 11 octal digits. To express anything larger, we need to use an extended header. This is exactly the same case we fixed for the size field in the previous commit, and the solution here follows the same pat

[PATCH 1/2] archive-tar: write extended headers for file sizes >= 8GB

The ustar format has a fixed-length field for the size of each file entry which is supposed to contain up to 11 bytes of octal-formatted data plus a NUL or space terminator. These means that the largest size we can represent is 0777, or 1 byte short of 8GB. The correct solution for a large

[PATCH 0/2] friendlier handling of overflows in archive-tar

The ustar format has some fixed-length numeric fields, and it's possible to generate a git tree that can't be represented (namely file size and mtime). Since f2f0267 (archive-tar: use xsnprintf for trivial formatting, 2015-09-24), we detect and die() in these cases. But we can actually do the frien

Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)

On Wed, Jun 15, 2016 at 11:32:39AM -0700, Junio C Hamano wrote: > Mike Hommey writes: > > > On Tue, Jun 14, 2016 at 03:08:04PM -0700, Junio C Hamano wrote: > > >> * mh/connect (2016-06-06) 10 commits > >> - connect: [host:port] is legacy for ssh > >> ... > >> - connect: document why we sometim

Re: [PATCH 16/38] resolve_gitlink_ref(): implement using resolve_ref_recursively()

On 06/14/2016 07:03 AM, Eric Sunshine wrote: > On Fri, Jun 3, 2016 at 5:03 PM, Michael Haggerty wrote: >> resolve_ref_recursively() can handle references in arbitrary files >> reference stores, so use it to resolve "gitlink" (i.e., submodule) >> references. Aside from removing redundant code, this

Re: Easiest way to clone over an existing directory?

On Wed, Jun 15, 2016 at 08:51:34AM -0700, Josh Triplett wrote: > Currently, every time I set up a new system, I run the following: > > git clone $MY_HOMEDIR > mv home/.git . > rm -r home > git checkout -f > > This seems like an odd dance to go through. But I can't just git clone > into ~ directl

Re: [PATCH v4 6/6] send-email: add option --cite to quote the message body

Le 09/06/2016 à 13:49, Matthieu Moy a écrit : > Samuel GROOT writes: > >> If used with `in-reply-to=`, cite the message body of the given >> email file. Otherwise, do nothing. > > It should at least warn when --in-reply-to= is not given > (either no --in-reply-to or --in-reply-to=). I don't see

"git-rebase -i --autostash" will leave dangling stash when editor is aborted

TEST CASE: 1. Modify a file that need to get stashed on rebasing 2. Run "EDITOR=vim git rebase -i --autostash" 3. Abort with ":cq", which will make Vim exit non-zero Git then will create an autostash, but aborts with "Could not execute editor", via the following code in git-rebase--interactive.sh

Re: [PATCH] verify-tag: allow to verify signed blob objects

On Wed, Jun 15, 2016 at 12:24 PM, Junio C Hamano wrote: > Michael J Gruber writes: > >>> Or even >>> >>> if ((flags & GPG_VERIFY_BLOB) && (type != OBJ_BLOB)) >>> "you told me to check blob but didn't give me one"; >>> } else if (type != OBJ_TAG) >>> "yo

Re: [PATCH v2 5/6] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: > Reimplement `is_expected_rev` & `check_expected_revs` shell function in > C and add a `--check-expected-revs` subcommand to `git bisect--helper` to > call it from git-bisect.sh . > [...] > Signed-off-by: Pranit Bauva > --- > diff --git a/bui

Re: [PATCH v2 4/6] bisect--helper: `bisect_reset` shell function in C

On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: > Reimplement `bisect_reset` shell function in C and add a `--bisect-reset` > subcommand to `git bisect--helper` to call it from git-bisect.sh . > [...] > Signed-off-by: Pranit Bauva > --- > diff --git a/builtin/bisect--helper.c b/builtin/bise

Re: [PATCH] Document the 'svn propset' command.

> On Jun 15, 2016, at 1:24 PM, Alfred Perlstein wrote: > >> On Jun 15, 2016, at 1:21 PM, Junio C Hamano wrote: >> >> Eric Wong writes: >> >>> Thanks Alfred, >>> >>> I've removed the '.' from the commit subject, signed-off, >>> and pushed to my repo for Junio: >>> >>> The following changes s

Re: [PATCH] Document the 'svn propset' command.

> On Jun 15, 2016, at 1:21 PM, Junio C Hamano wrote: > > Eric Wong writes: > >> Thanks Alfred, >> >> I've removed the '.' from the commit subject, signed-off, >> and pushed to my repo for Junio: >> >> The following changes since commit 05219a1276341e72d8082d76b7f5ed394b7437a4: >> >> Git 2

Re: [PATCH] Document the 'svn propset' command.

Alfred Perlstein wrote: > Add example usage to the git-svn documentation. > > Reported-by: Joseph Pecoraro > Signed-off-by: Alfred Perlstein > --- > > Junio, Pranit, + all, > > A week ago I was requested to provide documentation for the > 'svn propset' command. I have attached a diff off of

Re: [PATCH v2 1/6] bisect--helper: `bisect_clean_state` shell function in C

On Wed, Jun 15, 2016 at 2:47 PM, Pranit Bauva wrote: > On Wed, Jun 15, 2016 at 11:34 PM, Eric Sunshine > wrote: >> On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva >> wrote: >>> Reimplement `bisect_clean_state` shell function in C and add a >>> `bisect-clean-state` subcommand to `git bisect--hel

Re: [PATCH] Document the 'svn propset' command.

Eric Wong writes: > Thanks Alfred, > > I've removed the '.' from the commit subject, signed-off, > and pushed to my repo for Junio: > > The following changes since commit 05219a1276341e72d8082d76b7f5ed394b7437a4: > > Git 2.9 (2016-06-13 10:42:13 -0700) > > are available in the git repository at

Re: [RFC/PATCH] push: deny policy to prevent pushes to unwanted remotes.

>> ... >> > > Hello Rémi, thanks you for your input ! I'll make the appropriate changes > and send a new version as soon as i can ! Hi Antoine, do you have an updated version already or is this the one I should look at? http://article.gmane.org/gmane.comp.version-control.git/296445 Thanks, L

Re: [PATCH] push: deny policy to prevent pushes to unwanted remotes.

On 06 Jun 2016, at 16:00, Antoine Queru wrote: > Hello Lars, thanks for your reply. >> >> >>> On 30 May 2016, at 06:45, Antoine Queru >>> wrote: >>> >>> Currently, a user wanting to prevent accidental pushes to the wrong remote >>> has to create a pre-push hook. >>> The feature offers a co

Re: [PATCH] verify-tag: allow to verify signed blob objects

Michael J Gruber writes: >> Or even >> >> if ((flags & GPG_VERIFY_BLOB) && (type != OBJ_BLOB)) >> "you told me to check blob but didn't give me one"; >> } else if (type != OBJ_TAG) >> "you didn't give me a tag"; >> > > I just tried to stay as close to

Re: [PATCH] verify-tag: allow to verify signed blob objects

Junio C Hamano venit, vidit, dixit 15.06.2016 20:39: > Michael J Gruber writes: > >> diff --git a/tag.c b/tag.c >> index d1dcd18..d5f090b 100644 >> --- a/tag.c >> +++ b/tag.c >> @@ -39,7 +39,7 @@ int gpg_verify_tag(const unsigned char *sha1, const char >> *name_to_report, >> int ret; >> >

Re: [PATCH v2 1/6] bisect--helper: `bisect_clean_state` shell function in C

Hey Eric, On Wed, Jun 15, 2016 at 11:34 PM, Eric Sunshine wrote: > On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: >> Reimplement `bisect_clean_state` shell function in C and add a >> `bisect-clean-state` subcommand to `git bisect--helper` to call it from >> git-bisect.sh . >> [...] >> Sig

Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)

Duy Nguyen writes: >> * nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits >> - worktree: simplify prefixing paths >> - worktree: avoid 0{40}, too many zeroes, hard to read >> - worktree.c: use is_dot_or_dotdot() >> - git-worktree.txt: keep subcommand listing in alphabetical orde

Re: [PATCH v2 3/6] wrapper: move is_empty_file() from builtin/am.c

Hey Eric, On Wed, Jun 15, 2016 at 11:52 PM, Eric Sunshine wrote: > On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: >> is_empty_file() can help to refactor a lot of code. Also it is quite >> helpful while converting shell scripts which use `test -s`. Since > > As justification, "can help to

Re: [PATCH] verify-tag: allow to verify signed blob objects

Michael J Gruber writes: > diff --git a/tag.c b/tag.c > index d1dcd18..d5f090b 100644 > --- a/tag.c > +++ b/tag.c > @@ -39,7 +39,7 @@ int gpg_verify_tag(const unsigned char *sha1, const char > *name_to_report, > int ret; > > type = sha1_object_info(sha1, NULL); > - if (type !=

Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)

Mike Hommey writes: > On Tue, Jun 14, 2016 at 03:08:04PM -0700, Junio C Hamano wrote: >> * mh/connect (2016-06-06) 10 commits >> - connect: [host:port] is legacy for ssh >> ... >> - connect: document why we sometimes call get_port after get_host_and_port >> >> Ok, folks, is everybody happy w

Re: [PATCH v2 3/6] wrapper: move is_empty_file() from builtin/am.c

On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: > is_empty_file() can help to refactor a lot of code. Also it is quite > helpful while converting shell scripts which use `test -s`. Since As justification, "can help to refactor a lot of code" is very nebulous. It would be better to give a co

Re: [PATCH v2 3/6] wrapper: move is_empty_file() from builtin/am.c

Hey Junio, On Wed, Jun 15, 2016 at 11:42 PM, Junio C Hamano wrote: > Pranit Bauva writes: > >> diff --git a/builtin/am.c b/builtin/am.c >> index 3dfe70b..84f21d0 100644 >> --- a/builtin/am.c >> +++ b/builtin/am.c >> @@ -30,22 +30,6 @@ >> #include "mailinfo.h" >> >> /** >> - * Returns 1 if the

Re: [PATCH v2 3/6] wrapper: move is_empty_file() from builtin/am.c

Pranit Bauva writes: > diff --git a/builtin/am.c b/builtin/am.c > index 3dfe70b..84f21d0 100644 > --- a/builtin/am.c > +++ b/builtin/am.c > @@ -30,22 +30,6 @@ > #include "mailinfo.h" > > /** > - * Returns 1 if the file is empty or does not exist, 0 otherwise. > - */ > -static int is_empty_fil

Re: [PATCH v2 0/6] convert various shell functions in git-bisect to C

Hey Eric, On Wed, Jun 15, 2016 at 11:23 PM, Eric Sunshine wrote: > On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: >> Changes wrt previous version: >> * Use STRING_LIST_INIT_NODUP to avoid leaks in bisect_clean_state() >> * Use test_path_is_missing in the patch 2/6 >> * drop file_size()

Re: [PATCH v2 1/6] bisect--helper: `bisect_clean_state` shell function in C

On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: > Reimplement `bisect_clean_state` shell function in C and add a > `bisect-clean-state` subcommand to `git bisect--helper` to call it from > git-bisect.sh . > [...] > Signed-off-by: Pranit Bauva > --- > diff --git a/builtin/bisect--helper.c b/

Re: [PATCH] hooks--pre-commit.sample: check for chars, that are not allowed for a windows file name

dexteritas writes: > After the ASCII-check, test the windows compatibility of file names. > Can be disabled by: > git config hooks.allownonwindowschars true > --- Missing sign off. > templates/hooks--pre-commit.sample | 22 ++ > 1 file changed, 22 insertions(+) > > diff --g

Re: [PATCH v2 0/6] convert various shell functions in git-bisect to C

On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva wrote: > Changes wrt previous version: > * Use STRING_LIST_INIT_NODUP to avoid leaks in bisect_clean_state() > * Use test_path_is_missing in the patch 2/6 > * drop file_size() > * move is_empty_file() method from builtin/am.c to wrapper.c > * use

Easiest way to clone over an existing directory?

Currently, every time I set up a new system, I run the following: git clone $MY_HOMEDIR mv home/.git . rm -r home git checkout -f This seems like an odd dance to go through. But I can't just git clone into ~ directly, because git clone will not clone into an existing non-empty directory. (I cou

[PATCH v2 5/6] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

Reimplement `is_expected_rev` & `check_expected_revs` shell function in C and add a `--check-expected-revs` subcommand to `git bisect--helper` to call it from git-bisect.sh . Using `--check-expected-revs` subcommand is a temporary measure to port shell functions to C so as to use the existing test

[PATCH v2 4/6] bisect--helper: `bisect_reset` shell function in C

Reimplement `bisect_reset` shell function in C and add a `--bisect-reset` subcommand to `git bisect--helper` to call it from git-bisect.sh . Using `bisect_reset` subcommand is a temporary measure to port shell functions to C so as to use the existing test suite. As more functions are ported, this

[PATCH v2 0/6] convert various shell functions in git-bisect to C

A previous version is available here[1]. Changes wrt previous version: * Use STRING_LIST_INIT_NODUP to avoid leaks in bisect_clean_state() * Use test_path_is_missing in the patch 2/6 * drop file_size() * move is_empty_file() method from builtin/am.c to wrapper.c * use static for methods * re

[PATCH v2 3/6] wrapper: move is_empty_file() from builtin/am.c

is_empty_file() can help to refactor a lot of code. Also it is quite helpful while converting shell scripts which use `test -s`. Since is_empty_file() is now a "library" function, its inappropriate to die() so instead error_errno() is used to convey the message to stderr while the appropriate boole

[PATCH v2 2/6] t6030: explicitly test for bisection cleanup

This is not an improvement in the test coverage but it helps in making it explicit as to what exactly would be the error as other tests are focussed on testing other things. Mentored-by: Lars Schneider Mentored-by: Christian Couder Signed-off-by: Pranit Bauva --- I faced this problem while con

[PATCH v2 1/6] bisect--helper: `bisect_clean_state` shell function in C

Reimplement `bisect_clean_state` shell function in C and add a `bisect-clean-state` subcommand to `git bisect--helper` to call it from git-bisect.sh . Using `--bisect-clean-state` subcommand is a measure to port shell function to C so as to use the existing test suite. As more functions are ported

[PATCH v2 6/6] bisect--helper: `bisect_write` shell function in C

Reimplement the `bisect_write` shell function in C and add a `bisect-write` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--bisect-write` subcommand is a temporary measure to port shell function in C so as to use the existing test suite. As more functions are ported, this

Re: Git clone 2.9.0

On Wed, Jun 15, 2016 at 8:08 PM, Wojciech Rybiński wrote: > Hi, > > I have installed version 2.9.0 and when I’m trying to clone repo with > specific tag I get error: unknown option `single-branch’ and next warning: > Remote branch a3.0.26 not found in upstream origin, using HEAD instead. My > c

Git clone 2.9.0

Hi, I have installed version 2.9.0 and when I’m trying to clone repo with specific tag I get error: unknown option `single-branch’ and next warning: Remote branch a3.0.26 not found in upstream origin, using HEAD instead. My command looks like that: git clone --single-branch -b a3.0.26 git@… and

Re: bug: compactionheuristic config var case issue

On Wed, Jun 15, 2016 at 5:39 PM, Brian Lalor wrote: > I’m very happy to see the new compaction heuristic option; it’s the way I > always thought diffs should read! > > The config option in the documentation references “diff.compactionHeuristic”, > but diff.c does a case-sensitive comparison on “

Bug report: stdout vs stderr

Why half of Git output goes to stdout and half to stderr? I suspect this is a bug. Below I call `git pushbug` alias defined it the below presented config file. $ cat .git/config  [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = tru

[ANNOUNCE] Git Rev News edition 16

Hi everyone, I'm happy announce that the 16th edition of Git Rev News is now published: http://git.github.io/rev_news/2016/06/15/edition-16/ Thanks a lot to all the contributors and helpers, especially Duy and the Ensimag students! Enjoy, Christian, Thomas and Nicola. -- To unsubscribe from thi

[PATCH] verify-tag: allow to verify signed blob objects

Currently, there is no easy way to verify push certificates. They have the same structure as signed tags: "attached detached signatures", that is: the concatenation of the signed material and its detached signature. Introduce a `--blob` option to verify-tag so that it allows to verify tags and blo

Re: [PATCH] hooks--pre-commit.sample: check for chars, that are not allowed for a windows file name

Am 15.06.2016 um 10:02 schrieb dexteritas: > After the ASCII-check, test the windows compatibility of file names. > Can be disabled by: > git config hooks.allownonwindowschars true > --- > templates/hooks--pre-commit.sample | 22 ++ > 1 file changed, 22 insertions(+) > > diff

bug: compactionheuristic config var case issue

I’m very happy to see the new compaction heuristic option; it’s the way I always thought diffs should read! The config option in the documentation references “diff.compactionHeuristic”, but diff.c does a case-sensitive comparison on “diff.compactionheuristic” (note the case of the “h” in “heu

Re: I lost my commit signature

Thank you all very much! -Schrödinger On Wed, Jun 15, 2016 at 3:07 PM, Michael J Gruber wrote: > Jeff King venit, vidit, dixit 15.06.2016 06:34: >> On Wed, Jun 15, 2016 at 12:27:15PM +0800, ZhenTian wrote: >> >>> I got two more lines from gpg -v during commit with -S: >>> ``` >>> gpg: writing to

Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)

On Wed, Jun 15, 2016 at 5:08 AM, Junio C Hamano wrote: > * nd/i-t-a-commitable (2016-06-06) 3 commits > - commit: don't count i-t-a entries when checking if the new commit is empty > - Resurrect "diff-lib.c: adjust position of i-t-a entries in diff" > - diff.h: extend "flags" field to 64 bits b

Re: [ANNOUNCE] Sharness v1.0.0

>> Is there any word out there from Mathias on making you the designated >> new maintainer? (I cannot tell if this is a genuine maintainer change, or >> a [hostile] fork by reading this email, and I don't know much of the context, Yes, it's 100% genuine. I handed over maintenance to Christian Coud

[PATCH] hooks--pre-commit.sample: check for chars, that are not allowed for a windows file name

After the ASCII-check, test the windows compatibility of file names. Can be disabled by: git config hooks.allownonwindowschars true --- templates/hooks--pre-commit.sample | 22 ++ 1 file changed, 22 insertions(+) diff --git a/templates/hooks--pre-commit.sample b/templates/hoo

Re: What's cooking in git.git (Jun 2016, #04; Tue, 14)

2016-06-15 0:08 GMT+02:00 Junio C Hamano : > 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 hol

Re: [PATCHv3] gpg-interface: check gpg signature creation status

Jeff King venit, vidit, dixit 15.06.2016 02:56: > On Tue, Jun 14, 2016 at 04:47:35PM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >>> I'm still undecided on whether it is a better approach than making >>> sure the stdout we got looks sane. In particular I'd worry that it >>> would make

Re: I lost my commit signature

Jeff King venit, vidit, dixit 15.06.2016 06:34: > On Wed, Jun 15, 2016 at 12:27:15PM +0800, ZhenTian wrote: > >> I got two more lines from gpg -v during commit with -S: >> ``` >> gpg: writing to stdout >> gpg: RSA/SHA1 signature from: "2EF2AD6E Tian Zhen " >> ``` >> >> after I commit, I push it to