[ANNOUNCE] Git v2.16.0-rc2

2018-01-11 Thread Junio C Hamano
A release candidate Git v2.16.0-rc2 is now available for testing at the usual places. It is comprised of 483 non-merge commits since v2.15.0, contributed by 80 people, 23 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following

Re: [PATCH] doc/read-tree: remove obsolete remark

2018-01-11 Thread Jeff King
On Thu, Jan 11, 2018 at 03:14:07PM -0800, Junio C Hamano wrote: > >> Doesn't "git read-tree --prefix=previous HEAD^" add paths like > >> "previous/Documentation/Makefile" to the index, i.e. instead of > >> forcing you to have the required slash at the end, we give one for > >> free when it is

Re: [PATCH] doc/read-tree: remove obsolete remark

2018-01-11 Thread Junio C Hamano
Jeff King writes: > On Thu, Jan 11, 2018 at 11:02:04AM -0800, Junio C Hamano wrote: > >> >> ---prefix=/:: >> >> +--prefix=:: >> >> Keep the current index contents, and read the contents >> >> of the named tree-ish under the directory at ``. >> >> The command will refuse to

Re: [PATCH] doc/read-tree: remove obsolete remark

2018-01-11 Thread Jeff King
On Thu, Jan 11, 2018 at 11:02:04AM -0800, Junio C Hamano wrote: > >> ---prefix=/:: > >> +--prefix=:: > >>Keep the current index contents, and read the contents > >>of the named tree-ish under the directory at ``. > >>The command will refuse to overwrite entries that already > >> -

RE: [BUG] Weird breakages in t1450 #2 on NonStop

2018-01-11 Thread Randall S. Becker
On January 11, 2018 9:46 AM, I wrote: > This one has me scratching my head: > > The object file name being reported below in t1450, subtest 2 is corrupt, but I > can't figure out why the script might be generating this condition - there's > nothing apparent, but it looks like the git commit -m C

git gc --auto yelling at users where a repo legitimately has >6700 loose objects

2018-01-11 Thread Ævar Arnfjörð Bjarmason
I recently disabled gc.auto=0 and my nightly aggressive repack script on our big monorepo across our infra, relying instead on git gc --auto in the background to just do its thing. I didn't want users to wait for git-gc, and I'd written this nightly cronjob before git-gc learned to detach to the

Dear Friend Please Respond

2018-01-11 Thread james kabore
From:MR.JAMES KABORE. Bill and Exchange Manager Micro Finance Bank Plc Burkina Faso Dear Friend, I know that this mail will come to you as a surprise. I am MR.JAMES KABORE. and I am the bill and Exchange manager in a Bank here in my country .I Hope that you will not expose or betray this trust

Re: [PATCH v2 2/2] submodule: port submodule subcommand 'deinit' from shell to C

2018-01-11 Thread Junio C Hamano
Prathamesh Chavan writes: > + /* remove the submodule work tree (unless the user already did it) */ > + if (is_directory(path)) { > + struct strbuf sb_rm = STRBUF_INIT; > + const char *format; > + > + /* > + * protect

Re: [PATCH v2 0/2] Incremental rewrite of git-submodules

2018-01-11 Thread Junio C Hamano
Prathamesh Chavan writes: > Changes made to the previous version of the patch series[1]: > > * Since later on with certain patches, the number of bit-parameters to > be passed to a few functions depend on many parameters, I prefered > using a single flag bit. I am not

Re: [PATCH v2 1/2] submodule: port submodule subcommand 'sync' from shell to C

2018-01-11 Thread Junio C Hamano
Prathamesh Chavan writes: > + } else { > + sub_origin_url = xstrdup(sub->url); > + super_config_url = xstrdup(sub->url); > + } > + } else { > + sub_origin_url = ""; > + super_config_url

Re: [PATCH v5 8/9] sequencer: try to commit without forking 'git commit'

2018-01-11 Thread Johannes Schindelin
Hi Phillip, On Thu, 11 Jan 2018, Phillip Wood wrote: > On 10/01/18 22:40, Johannes Schindelin wrote: > > Hi, > > > > On Wed, 10 Jan 2018, Jonathan Nieder wrote: > > > >> that this causes the prepare-commit-msg hook not to be invoked, which > >> I think is unintentional. Should we check for

Re: [PATCH] Documentation/git-worktree.txt: add missing `

2018-01-11 Thread Junio C Hamano
Ralf Thielow writes: > of creating a new branch from HEAD, if there exists a tracking > - branch in exactly one remote matching the basename of `, > + branch in exactly one remote matching the basename of ``, > base the new branch on the

[PATCH v2 2/2] submodule: port submodule subcommand 'deinit' from shell to C

2018-01-11 Thread Prathamesh Chavan
The same mechanism is used even for porting this submodule subcommand, as used in the ported subcommands till now. The function cmd_deinit in split up after porting into four functions: module_deinit(), for_each_listed_submodule(), deinit_submodule() and deinit_submodule_cb(). Mentored-by:

[PATCH v2 1/2] submodule: port submodule subcommand 'sync' from shell to C

2018-01-11 Thread Prathamesh Chavan
Port the submodule subcommand 'sync' from shell to C using the same mechanism as that used for porting submodule subcommand 'status'. Hence, here the function cmd_sync() is ported from shell to C. This is done by introducing four functions: module_sync(), sync_submodule(), sync_submodule_cb() and

[PATCH v2 0/2] Incremental rewrite of git-submodules

2018-01-11 Thread Prathamesh Chavan
Changes made to the previous version of the patch series[1]: * Since later on with certain patches, the number of bit-parameters to be passed to a few functions depend on many parameters, I prefered using a single flag bit. * Memory-leak of the variable 'remote' in the function:

hi Git

2018-01-11 Thread rburgstaler
Good morning Git https://goo.gl/NUAiB7 rburgstaler

Re: [PATCH v2] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Occasionally submodule code could execute new commands with GIT_DIR set > to some submodule. GIT_TRACE prints just the command line which makes it > hard to tell that it's not really executed on this repository. > > Print modified env variables

Re: [PATCH] doc/read-tree: remove obsolete remark

2018-01-11 Thread Junio C Hamano
Jeff King writes: > On Tue, Jan 09, 2018 at 04:30:34PM +0100, Andreas G. Schacker wrote: > >> Earlier versions of `git read-tree` required the `--prefix` option value >> to end with a slash. This restriction was eventually lifted without a >> corresponding amendment to the

Re: [PATCH v2 4/9] object: add clear_commit_marks_all()

2018-01-11 Thread René Scharfe
Am 10.01.2018 um 08:58 schrieb Jeff King: > On Mon, Dec 25, 2017 at 06:44:58PM +0100, René Scharfe wrote: > >> Add a function for clearing the commit marks of all in-core commit >> objects. It's similar to clear_object_flags(), but more precise, since >> it leaves the other object types alone.

Re: [PATCH v2 5/9] bisect: avoid using the rev_info flag leak_pending

2018-01-11 Thread René Scharfe
Am 10.01.2018 um 09:07 schrieb Jeff King: > On Mon, Dec 25, 2017 at 06:45:36PM +0100, René Scharfe wrote: > >> The leak_pending flag is so awkward to use that multiple comments had to >> be added around each occurrence. We only use it for remembering the >> commits whose marks we have to clear

Re: [PATCH] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Johannes Sixt
Am 11.01.2018 um 11:07 schrieb Jeff King: The output for a single command is pretty shell-like due to the quoting: $ GIT_TRACE=1 ./git upload-pack . >/dev/null [...]run_command: 'git-upload-pack' '.' You could copy and paste that to a shell if you wanted. And with environment variables,

Re: [PATCH v2] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Stefan Beller
On Thu, Jan 11, 2018 at 9:53 AM, Brandon Williams wrote: > On 01/11, Nguyễn Thái Ngọc Duy wrote: >> Occasionally submodule code could execute new commands with GIT_DIR set >> to some submodule. GIT_TRACE prints just the command line which makes it >> hard to tell that it's not

[PATCH] Documentation/git-worktree.txt: add missing `

2018-01-11 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- Documentation/git-worktree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index f850e8ffb..41585f535 100644 --- a/Documentation/git-worktree.txt +++

Re: Unable to de-init stubborn submodule

2018-01-11 Thread Stefan Beller
On Thu, Jan 11, 2018 at 6:12 AM, Ævar Arnfjörð Bjarmason wrote: > What if we wanted to drop sha1collisiondetection/ as a submodule and > replace it with a copy of what's now in sha1dc/? I ran into this with > another project, but here's a way to reproduce it on git.git: > >

[ANNOUNCE] Git London User Group: 16 January 2018

2018-01-11 Thread Edward Thomson
Git London User Group: 16 January, 2018 === I'm pleased to announce the formation of the Git London User Group, where Git users and experts from throughout the UK can get together to share tips, experience and assistance for using Git successfully. The first

Re: [PATCH v2] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Brandon Williams
On 01/11, Nguyễn Thái Ngọc Duy wrote: > Occasionally submodule code could execute new commands with GIT_DIR set > to some submodule. GIT_TRACE prints just the command line which makes it > hard to tell that it's not really executed on this repository. > > Print modified env variables (compared to

Re: Unable to de-init stubborn submodule

2018-01-11 Thread Brandon Williams
On 01/11, Ævar Arnfjörð Bjarmason wrote: > What if we wanted to drop sha1collisiondetection/ as a submodule and > replace it with a copy of what's now in sha1dc/? I ran into this with > another project, but here's a way to reproduce it on git.git: > > ( > rm -rf /tmp/git && >

[PATCH] l10n: de.po: translate 72 new messages

2018-01-11 Thread Ralf Thielow
Translate 72 new messages came from git.pot update in 18a907225 (l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)) and 005c62fe4 (l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 227

[BUG] Weird breakages in t1450 #2 on NonStop

2018-01-11 Thread Randall S. Becker
This one has me scratching my head: The object file name being reported below in t1450, subtest 2 is corrupt, but I can't figure out why the script might be generating this condition - there's nothing apparent, but it looks like the git commit -m C step is reporting or using a bad name. This

Unable to de-init stubborn submodule

2018-01-11 Thread Ævar Arnfjörð Bjarmason
What if we wanted to drop sha1collisiondetection/ as a submodule and replace it with a copy of what's now in sha1dc/? I ran into this with another project, but here's a way to reproduce it on git.git: ( rm -rf /tmp/git && git clone g...@github.com:git/git.git /tmp/git

RE: [PATCH] Replaced read with xread in transport-helper.c to fix SSIZE_MAX overun in t5509

2018-01-11 Thread Randall S. Becker
On January 11, 2018 1:31 AM Jeff King wrote" > On Thu, Jan 11, 2018 at 12:40:05AM -0500, Randall S. Becker wrote: > > diff --git a/transport-helper.c b/transport-helper.c index > > 3640804..68a4e30 100644 > > --- a/transport-helper.c > > +++ b/transport-helper.c > > @@ -1202,7 +1202,7 @@ static

RE: [PATCH] Replaced read with xread in transport-helper.c to fix SSIZE_MAX overun in t5509

2018-01-11 Thread Randall S. Becker
On January 11, 2018 1:21 AM , Jeff King wrote: > On Thu, Jan 11, 2018 at 12:40:05AM -0500, Randall S. Becker wrote: > > This fix was needed on HPE NonStop NSE where SSIZE_MAX is less than > > BUFFERSIZE resulting in EINVAL. The call to read in transport-helper.c > > was the only place outside of

Re: read test snippet from stdin [was: [PATCH] t3900: add some more quotes]

2018-01-11 Thread Jeff King
On Thu, Jan 11, 2018 at 12:39:28PM +0100, SZEDER Gábor wrote: > > diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh > > index 9e4e694d93..09ad4d8878 100755 > > --- a/t/t3900-i18n-commit.sh > > +++ b/t/t3900-i18n-commit.sh > > @@ -39,14 +39,14 @@ test_expect_success 'UTF-16 refused

read test snippet from stdin [was: [PATCH] t3900: add some more quotes]

2018-01-11 Thread SZEDER Gábor
> I've often wondered if > our tests would be more readable taking the snippet over stdin. > Something like: > > diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh > index 9e4e694d93..09ad4d8878 100755 > --- a/t/t3900-i18n-commit.sh > +++ b/t/t3900-i18n-commit.sh > @@ -39,14 +39,14 @@

Re: [PATCH v2] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Duy Nguyen
On Thu, Jan 11, 2018 at 4:47 PM, Nguyễn Thái Ngọc Duy wrote: > Though, Stefan, while i'm not opposed to trace every single setting > in child_process, including variable deletion, cwd and even more, it Another thing I forgot to add, s/ and even more/, redirection&/. At some

Re: [PATCH] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Duy Nguyen
On Thu, Jan 11, 2018 at 5:07 PM, Jeff King wrote: > On Wed, Jan 10, 2018 at 05:48:35PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> Occasionally submodule code could execute new commands with GIT_DIR set >> to some submodule. GIT_TRACE prints just the command line which makes it >> hard

Re: [PATCH/RFC] add--interactive: ignore all internal submodule changes

2018-01-11 Thread Duy Nguyen
On Thu, Jan 11, 2018 at 2:47 AM, Stefan Beller wrote: > On Wed, Jan 10, 2018 at 3:06 AM, Nguyễn Thái Ngọc Duy > wrote: >> For 'add -i' and 'add -p' the only action we can take on a dirty >> submodule entry (from the superproject perspective) is its SHA-1.

Re: [PATCH] doc/read-tree: remove obsolete remark

2018-01-11 Thread Jeff King
On Tue, Jan 09, 2018 at 04:30:34PM +0100, Andreas G. Schacker wrote: > Earlier versions of `git read-tree` required the `--prefix` option value > to end with a slash. This restriction was eventually lifted without a > corresponding amendment to the documentation. Makes sense. > ---prefix=/:: >

Re: [PATCH v5 8/9] sequencer: try to commit without forking 'git commit'

2018-01-11 Thread Phillip Wood
On 10/01/18 22:40, Johannes Schindelin wrote: > Hi, > > On Wed, 10 Jan 2018, Jonathan Nieder wrote: > >> Phillip Wood wrote: >> >>> From: Phillip Wood >>> >>> If the commit message does not need to be edited then create the >>> commit without forking 'git commit'.

Re: [PATCH] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Jeff King
On Wed, Jan 10, 2018 at 05:48:35PM +0700, Nguyễn Thái Ngọc Duy wrote: > Occasionally submodule code could execute new commands with GIT_DIR set > to some submodule. GIT_TRACE prints just the command line which makes it > hard to tell that it's not really executed on this repository. > > Print

[PATCH v2] run-command.c: print env vars when GIT_TRACE is set

2018-01-11 Thread Nguyễn Thái Ngọc Duy
Occasionally submodule code could execute new commands with GIT_DIR set to some submodule. GIT_TRACE prints just the command line which makes it hard to tell that it's not really executed on this repository. Print modified env variables (compared to parent environment) in this case. Actually only

Re: [PATCH v4 0/4] Add --no-ahead-behind to status

2018-01-11 Thread Jeff King
On Wed, Jan 10, 2018 at 12:22:10PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > To be clear, which approach are we talking about? I think there are > > three options: > > > > 1. The user tells us not to bother computing real ahead/behind values. > > We always say

Re: [PATCH] t3900: add some more quotes

2018-01-11 Thread Jeff King
On Wed, Jan 10, 2018 at 01:31:22PM -0800, Junio C Hamano wrote: > > +# Read from stdin into the variable given in $1. > > +test_read_to_eof () { > > + # Bash's "read" is sufficiently flexible that we can skip the extra > > + # process. > > + if test -n "$BASH_VERSION" > > + then > > +

Re: [PATCH v4 8/7] wildmatch test: skip file creation tests on Windows proper

2018-01-11 Thread Duy Nguyen
On Thu, Jan 11, 2018 at 3:24 AM, Johannes Schindelin wrote: >> diff --git a/Makefile b/Makefile >> index 2a81ae22e9..567387b558 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -644,6 +644,7 @@ X = >> >> PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS)) >> >>

Re: git svn clone of messy repository

2018-01-11 Thread Eric Wong
Jason Greenbaum wrote: > --trunk=trunk/project_of_interest \ > --branches=branches/FF-1.0/project_of_interest \ > --branches=branches/FF-1.1/project_of_interest \ > The trunk seems to become the 'master' branch just fine, but my svn > branches are not pulled down. I'm not sure I