Re: [PATCH v2 2/3] git-submodule.txt: make subcommands underlined

2019-02-13 Thread Denton Liu
On Tue, Feb 12, 2019 at 01:56:11AM -0800, Denton Liu wrote: > In git-remote.txt, the subcommands are underlined. Following that, we > also underline the subcommands in git-submodule.txt. I'd like to retract this patch. I realised that between git-remote, git-submodule, git-notes, git-stash, git-bi

Re: [PATCH] Pretty-format: Ability to add newline after non-empty string

2019-02-13 Thread Mats Nilsson
Den tors 7 feb. 2019 kl 18:29 skrev Junio C Hamano : > > matni...@gmail.com writes: > > > Subject: Re: [PATCH] Pretty-format: Ability to add newline after non-empty > > string > > Downcasing 'P' and 'A' would make this fit better when it appears in > the "git shortlog --no-merges" output, I think.

How to get next commit that just after a specified commit

2019-02-13 Thread wuzhouhui
Hi, I have searched Internet for while but couldn't find the answer. Suppose I have commit 212146f0800e then commit 73a4c5218414 and finally commit aadaa8061189 So I get following after 'git log': aadaa8061189 73a4c5218414 212146f0800e And now, my question is how to retrieve the nex

Re.

2019-02-13 Thread Johann Reimann
My Name is Johann Reimann and i have something important to discuss with you but only with your permission i will proceed. Regards J. Reimann

Re: How to get next commit that just after a specified commit

2019-02-13 Thread Ævar Arnfjörð Bjarmason
(Replying to https://public-inbox.org/git/383c14cc.9289.168e61d39e8.coremail.wuzhouhu...@mails.ucas.ac.cn/ which curiously I can see there, but not in my inbox (or spam)) Git's data format doesn't make it easy to find "C" given "B" in a commit chain like A->B->C (also there could be any number of

[PATCH v2] read-cache.c: fix writing "link" index ext with null base oid

2019-02-13 Thread Nguyễn Thái Ngọc Duy
Since commit 7db118303a (unpack_trees: fix breakage when o->src_index != o->dst_index - 2018-04-23) and changes in merge code to use separate index_state for source and destination, when doing a merge with split index activated, we may run into this line in unpack_trees(): o->result.split_inde

Re: [PATCH v2 2/3] git-submodule.txt: make subcommands underlined

2019-02-13 Thread Duy Nguyen
On Wed, Feb 13, 2019 at 3:15 PM Denton Liu wrote: > > On Tue, Feb 12, 2019 at 01:56:11AM -0800, Denton Liu wrote: > > In git-remote.txt, the subcommands are underlined. Following that, we > > also underline the subcommands in git-submodule.txt. > > I'd like to retract this patch. I realised that b

Re: [PATCH 1/1] mingw: fix CPU reporting in `git version --build-options`

2019-02-13 Thread Johannes Schindelin
Hi Eric, On Fri, 8 Feb 2019, Eric Sunshine wrote: > On Thu, Feb 7, 2019 at 5:46 AM Johannes Schindelin via GitGitGadget > wrote: > > We cannot rely on `uname -m` in Git for Windows' SDK to tell us what > > architecture we are compiling for, as we can compile both 32-bit and > > 64-bit `git.exe`

Re: [PATCH v7 07/16] sequencer: refactor sequencer_add_exec_commands() to work on a todo_list

2019-02-13 Thread Phillip Wood
Hi Alban On 12/02/2019 15:21, Alban Gruin wrote: > Hi Phillip, > > Le 12/02/2019 à 11:52, Phillip Wood a écrit : >> Hi Alban >> >> I think this is almost there, I've got a couple of small comments below. >> >> On 10/02/2019 13:26, Alban Gruin wrote: >>> -%<- >>> diff --git a/builtin/rebase--inter

Re: [PATCH v7 11/16] sequencer: refactor skip_unnecessary_picks() to work on a todo_list

2019-02-13 Thread Phillip Wood
Hi Alban On 10/02/2019 13:26, Alban Gruin wrote: > This refactors skip_unnecessary_picks() to work on a todo_list. As this > function is only called by complete_action() (and thus is not used by > rebase -p), the file-handling logic is completely dropped here. > > Instead of truncating the todo

Re: [RFC PATCH] pack-refs: fail on falsely sorted packed-refs

2019-02-13 Thread Ævar Arnfjörð Bjarmason
On Thu, Jan 31 2019, Max Kirillov wrote: > If packed-refs is marked as sorted but not really sorted it causes > very hard to comprehend misbehavior of reference resolving - a reference > is reported as not found. > > As the scope of the issue is not clear, make it visible by failing > pack-refs

Re: [PATCH v7 14/16] rebase-interactive: rewrite edit_todo_list() to handle the initial edit

2019-02-13 Thread Phillip Wood
Hi Alban I think the error handling is fine now, I've got a couple of small comments below. On 10/02/2019 13:26, Alban Gruin wrote: > edit_todo_list() is changed to work on a todo_list, and to handle the > initial edition of the todo list (ie. making a backup of the todo > list). > > It does not

Re: [PATCH v7 16/16] rebase--interactive: move several functions to rebase--interactive.c

2019-02-13 Thread Phillip Wood
Hi Alban I think it is a good idea to move these functions out of sequencer.c, previously I suggested moving them to rebase-interactive.c rather than builtin/rebase--interactive.c but I don't think it matters that much. If these can be moved when they're refactored (or in a separate commit immedia

[PATCH 0/1] Use a more canonical method to fix the CPU reporting on Windows

2019-02-13 Thread Johannes Schindelin via GitGitGadget
Eric Sunshine pointed out that I had completely forgotten about the HOST_CPU thing, and that is indeed the much better method of fixing the issue. Johannes Schindelin (1): mingw: use a more canonical method to fix the CPU reporting compat/mingw.h | 19 --- config.mak.uname |

[PATCH 1/1] mingw: use a more canonical method to fix the CPU reporting

2019-02-13 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In `git version --build-options`, we report also the CPU, but in Git for Windows we actually cross-compile the 32-bit version in a 64-bit Git for Windows, so we cannot rely on the auto-detected value. In 3815f64b0dd9 (mingw: fix CPU reporting in `git version --build-opt

Re: Workflow for GitHub branch model interop: advice?

2019-02-13 Thread Johannes Schindelin
Hi William, On Sat, 9 Feb 2019, William Chargin wrote: > [...] creating a whole worktree is a bit heavy-handed. Creating a new > worktree for linux.git takes about 6 seconds on my laptop, which is not > terrible considering that repository’s size, but would be nice to avoid > if possible. Agree

Re: Feature request on git log --oneline -- ...

2019-02-13 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 13 2019, Petri Gynther wrote: > git developers: > > Small feature request on: > git log --oneline -- ... > > Could we add an option to: > 1) display all commits in unconditionally > 2) use a special marker (e.g. star) for commits that touch ... > and list the files from ... that th

Re: [RFC PATCH] pack-refs: fail on falsely sorted packed-refs

2019-02-13 Thread SZEDER Gábor
On Wed, Feb 13, 2019 at 11:08:01AM +0100, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Jan 31 2019, Max Kirillov wrote: > > refs/packed-backend.c | 15 +++ > > t/t3212-pack-refs-broken-sorting.sh | 26 ++ > > 2 files changed, 41 insertions(+) > >

[PATCH v2] tests: avoid syntax triggering old dash bug

2019-02-13 Thread Ævar Arnfjörð Bjarmason
Avoid a bug in dash that's been fixed ever since its ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first released with dash v0.5.7 in July 2011. This failing test was introduced in 5f9674243d ("config: add --expiry-date", 2017-11-18). This fixes 1/2 tests failing on Debian Lenny &

[PATCH] read-cache.c: index format v5 -- 30% smaller/faster than v4

2019-02-13 Thread Nguyễn Thái Ngọc Duy
Index file size more or less translates to write time because we hash the entire file every time we update the index. And we update the index quite often (automatically index refresh is done everywhere). This means smaller index files are faster, especially true for very large worktrees. Index v4

Re: [PATCH v2] read-cache.c: fix writing "link" index ext with null base oid

2019-02-13 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 13 2019, Nguyễn Thái Ngọc Duy wrote: > Since commit 7db118303a (unpack_trees: fix breakage when o->src_index != > o->dst_index - 2018-04-23) and changes in merge code to use separate > index_state for source and destination, when doing a merge with split > index activated, we may run

Re: Feature request on git log --oneline -- ...

2019-02-13 Thread Duy Nguyen
On Wed, Feb 13, 2019 at 4:27 PM Petri Gynther wrote: > > git developers: > > Small feature request on: > git log --oneline -- ... > > Could we add an option to: > 1) display all commits in unconditionally > 2) use a special marker (e.g. star) for commits that touch ... > and list the files from

Re: [PATCH v5 14/15] trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh

2019-02-13 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 01 2019, Jeff Hostetler via GitGitGadget wrote: > +test_expect_success 'event stream, error event' ' > + test_when_finished "rm trace.event actual expect" && > + GIT_TR2_EVENT="$(pwd)/trace.event" test-tool trace2 003error "hello > world" "this is a test" && > + perl "$T

Re: [PATCH v2] rebase -x: sanity check command

2019-02-13 Thread Ævar Arnfjörð Bjarmason
On Tue, Jan 29 2019, Phillip Wood wrote: > From: Phillip Wood > > If the user gives an empty argument to --exec then git creates a todo > list that it cannot parse. The rebase starts to run before erroring out > with > > error: missing arguments for exec > error: invalid line 2: exec > Yo

Tailoring branch use case question

2019-02-13 Thread Jason Wenger
So I've got a use case that is cumbersome, and I'm wondering if it's a common one, or if anyone has found a better way to manage it. I have a repo that I work in where I make a set of changes to adapt it to my environment -- some config file changes and a couple code changes that help with debuggi

[PATCH] rebase: remove the rebase.useBuiltin setting

2019-02-13 Thread Ævar Arnfjörð Bjarmason
Remove the rebase.useBuiltin setting, which was added as an escape hatch to disable the builtin version of rebase first released with Git 2.20. See [1] for the initial implementation of rebase.useBuiltin, and [2] and [3] for the documentation and corresponding GIT_TEST_REBASE_USE_BUILTIN option.

Re: Git v2.21.0-rc0 broken on *BSD, maybe others

2019-02-13 Thread Johannes Schindelin
Hi, On Tue, 12 Feb 2019, SZEDER Gábor wrote: > On Tue, Feb 12, 2019 at 02:14:56PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > > On Tue, Feb 12 2019, Duy Nguyen wrote: > > > > > On Tue, Feb 12, 2019 at 7:43 PM Duy Nguyen wrote: > > >> The test failures on NetBSD and Solaris/Sparc, not sure if w

Re: [BUG] More on t5562 hangs randomly in subtests 6,8 and 13 in 2.21.0-rc0

2019-02-13 Thread randall.s.becker
On 2019-02-13, Max Kirillov, wrote: >On Mon, Feb 11, 2019 at 11:59:00AM -0500, Randall S. Becker wrote: >> Hi All, >> >> I have localized the hang in t5562 (previous thread) to the >> invoke-with-content-length.pl script. > >I have yet to look at it more closely, but there have been >one case of m

Re: [PATCH] rebase: remove the rebase.useBuiltin setting

2019-02-13 Thread Johannes Schindelin
Hi Ævar, On Wed, 13 Feb 2019, Ævar Arnfjörð Bjarmason wrote: > Remove the rebase.useBuiltin setting, which was added as an escape > hatch to disable the builtin version of rebase first released with Git > 2.20. I like it! Thanks, Dscho > > See [1] for the initial implementation of rebase.useB

Re: [PATCH v6 2/2] config: allow giving separate author and committer idents

2019-02-13 Thread William Hubbs
Hi Junio, I am writing back onn this thread because I'm not quite sure of the status. v5 of the patch seemed ok, but there were some changes discussed that would have created a v6. The v6 changes though were never really clear. I'm not sure whether I am supposed to be doing something more or wheth

Re: [Patch v1 2/3] t5318: replace use of /dev/zero with generate_zero_bytes

2019-02-13 Thread Junio C Hamano
Junio C Hamano writes: > Eric Sunshine writes: > >> On Sat, Feb 9, 2019 at 2:00 PM wrote: >>> This change removes the dependency on /dev/zero with generate_zero_bytes >>> appending NUL values to blocks generating wrong signatures for test cases. >> >> This commit message says what the patch doe

Re: [Patch v1 3/3] t5562: replace /dev/zero with a pipe from generate_zero_bytes

2019-02-13 Thread Junio C Hamano
Johannes Sixt writes: > Am 12.02.19 um 18:24 schrieb Junio C Hamano: diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh @@ -143,14 +143,14 @@ test_expect_success GZIP 'push gzipped empty' ' test_expect_success 'CONTENT_LENGTH overflo

Re: [BUG] More on t5562 hangs randomly in subtests 6,8 and 13 in 2.21.0-rc0

2019-02-13 Thread Max Kirillov
On Wed, Feb 13, 2019 at 10:16:26AM -0500, randall.s.bec...@rogers.com wrote: > On 2019-02-13, Max Kirillov, wrote: > As far as the unintended reuse of the output file, and issues with pipes, > yes, the NonStop is very sensitive to complex use of pipes and much of the > compatibility issues we have

RE: [Patch v1 2/3] t5318: replace use of /dev/zero with generate_zero_bytes

2019-02-13 Thread Randall S. Becker
> -Original Message- > From: Junio C Hamano On Behalf Of Junio C Hamano > Sent: February 13, 2019 12:25 > To: Eric Sunshine > Cc: randall.s.bec...@rogers.com; Git List ; Randall S. > Becker > Subject: Re: [Patch v1 2/3] t5318: replace use of /dev/zero with > generate_zero_bytes > > Juni

Git-pull Documentation

2019-02-13 Thread Maris Razvan
Hello, In the "EXAMPLES" section of the git-pull documentation (https://git-scm.com/docs/git-pull#_examples) there is the following: "[...] Merge into the current branch the remote branch next: $ git pull origin next This leaves a copy of next temporarily in FETCH_HEAD, but does not

RE: [BUG] More on t5562 hangs randomly in subtests 6,8 and 13 in 2.21.0-rc0

2019-02-13 Thread Randall S. Becker
On February 13, 2019 12:41, Max Kirillov wrote: > On Wed, Feb 13, 2019 at 10:16:26AM -0500, randall.s.bec...@rogers.com > wrote: > > On 2019-02-13, Max Kirillov, wrote: > > As far as the unintended reuse of the output file, and issues with > > pipes, yes, the NonStop is very sensitive to complex us

Re: [PATCH v2 2/3] git-submodule.txt: make subcommands underlined

2019-02-13 Thread Junio C Hamano
Denton Liu writes: > On Tue, Feb 12, 2019 at 01:56:11AM -0800, Denton Liu wrote: >> In git-remote.txt, the subcommands are underlined. Following that, we >> also underline the subcommands in git-submodule.txt. > > I'd like to retract this patch. I realised that between git-remote, > git-submodule

External tool is ignored when using difftool with --no-index

2019-02-13 Thread Sylvain Lacaze
Hi, I have “p4merge” setup as diff.tool and merge.tool, and it work great in normal operation (i.e., “p4merge” opens), e.g: $: git difftool HEAD~3 somePath/someFile.m However, when I use “—no-index” to compare 2 arbitrary file, difftool just uses diff: $: git difftool --no-index somePath/someFi

Re: [PATCH v2 3/3] submodule: document default behavior

2019-02-13 Thread Junio C Hamano
Denton Liu writes: > This patch documents the default behavior of submodule if no subcommands > are given, similar to how remote documents it in both git-remote.txt and > in its usage output. Let's stop saying "This patch does this, this patch does that". Instead (1) state what you think is wro

Hello Good Day

2019-02-13 Thread Mr Louis Smithr
Good day, My name is Mr.Louis Smith am Financial Consultant, one of my client have interest in Investing in your country into a Joint venture Agreement. Kindly contact me via my email if you are interested so that we can talk more. this is my personal email: louissmith...@yahoo.com I await you

Git - logo commercial use

2019-02-13 Thread Agnieszka Borcz
Dear Sir/Madam, My partner and I are in the initial stages of setting up an e-commerce business selling high-quality stickers of logos of popular software and libraries. We would mainly be marketing towards software developers, as there are many who enjoy placing stickers of their favorite tech

Re: Git - logo commercial use

2019-02-13 Thread Mateusz Loskot
On Wed, 13 Feb 2019 at 20:34, Agnieszka Borcz wrote: > > Dear Sir/Madam, > > My partner and I are in the initial stages of setting up an e-commerce > business selling high-quality stickers of logos of popular software and > libraries. We would mainly be marketing towards software developers, as

[PATCH] diff: reuse diff setup for --no-index case

2019-02-13 Thread Jeff King
On Wed, Feb 13, 2019 at 06:50:19PM +, Sylvain Lacaze wrote: > I have “p4merge” setup as diff.tool and merge.tool, and it work great > in normal operation (i.e., “p4merge” opens), e.g: > > $: git difftool HEAD~3 somePath/someFile.m > > However, when I use “—no-index” to compare 2 arbitrary fi

Re: [PATCH] rebase: remove the rebase.useBuiltin setting

2019-02-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Remove the rebase.useBuiltin setting, which was added as an escape > hatch to disable the builtin version of rebase first released with Git > 2.20. > ... >> This patch breaks the test suite (with these two new tests) under >> GIT_TEST_REBASE_USE_BUILTIN=false. S

[GSoC][RFC PATCH] clone: use dir-iterator to avoid explicit dir traversal

2019-02-13 Thread Matheus Tavares
Replace usage of opendir/readdir/closedir API to traverse directories recursively, at copy_or_link_directory function, by the dir-iterator API. Signed-off-by: Matheus Tavares --- This is my microproject for GSoC 2019. It's still a RFC because I have some questions. Any help will be much appreci

Re: [Patch v1 2/3] t5318: replace use of /dev/zero with generate_zero_bytes

2019-02-13 Thread Junio C Hamano
"Randall S. Becker" writes: > My second attempt was to create the generate_zero_bytes function to replace > exactly what the second dd was doing but not user /dev/zero. Yes, and I think the patch does that ;-) It was just the original dd if=/dev/zero of=... bs=1 seek=$there count=$this_man

RE: [Patch v1 2/3] t5318: replace use of /dev/zero with generate_zero_bytes

2019-02-13 Thread Randall S. Becker
On February 13, 2019 16:01, Junio C Hamano wrote: > "Randall S. Becker" writes: > > > My second attempt was to create the generate_zero_bytes function to > > replace exactly what the second dd was doing but not user /dev/zero. > > Yes, and I think the patch does that ;-) It was just the origina

Re: Feature request on git log --oneline -- ...

2019-02-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > What do you think such an option should do when it finds negative path > specs, e.g. this on git.git: > > git log --oneline --stat -- ':!/Makefile' '*Makefile*' > > Should it only render positive matches, or distinguish between > matched/blacklisted/not-match

Re: How to get next commit that just after a specified commit

2019-02-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > (Replying to > https://public-inbox.org/git/383c14cc.9289.168e61d39e8.coremail.wuzhouhu...@mails.ucas.ac.cn/ > which curiously I can see there, but not in my inbox (or spam)) > > Git's data format doesn't make it easy to find "C" given "B" in a commit > chain lik

Re: How to get next commit that just after a specified commit

2019-02-13 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 13 2019, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> (Replying to >> https://public-inbox.org/git/383c14cc.9289.168e61d39e8.coremail.wuzhouhu...@mails.ucas.ac.cn/ >> which curiously I can see there, but not in my inbox (or spam)) >> >> Git's data format doesn't make

Re: [PATCH v2] tests: avoid syntax triggering old dash bug

2019-02-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Avoid a bug in dash that's been fixed ever since its > ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first > released with dash v0.5.7 in July 2011. This failing test was > introduced in 5f9674243d ("config: add --expiry-date", 2017-11-18). Tha

Re: [PATCH 1/1] mingw: use a more canonical method to fix the CPU reporting

2019-02-13 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > In `git version --build-options`, we report also the CPU, but in Git for > Windows we actually cross-compile the 32-bit version in a 64-bit Git for > Windows, so we cannot rely on the auto-detected value. > > In 3815f

Re: [PATCH v2] tests: avoid syntax triggering old dash bug

2019-02-13 Thread SZEDER Gábor
On Wed, Feb 13, 2019 at 12:59:51PM +0100, Ævar Arnfjörð Bjarmason wrote: > Avoid a bug in dash that's been fixed ever since its > ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first > released with dash v0.5.7 in July 2011. This failing test was > introduced in 5f9674243d ("config:

[PATCH] rebase: fix regression in rebase.useBuiltin=false test mode

2019-02-13 Thread Ævar Arnfjörð Bjarmason
Fix a recently introduced regression in c762aada1a ("rebase -x: sanity check command", 2019-01-29) triggered when running the tests with GIT_TEST_REBASE_USE_BUILTIN=false. See 62c23938fa ("tests: add a special setup where rebase.useBuiltin is off", 2018-11-14) for how that test mode works. As disc

Re: [PATCH] read-cache.c: index format v5 -- 30% smaller/faster than v4

2019-02-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > @@ -1749,16 +1750,16 @@ static struct cache_entry *create_from_disk(struct > mem_pool *ce_mem_pool, >* number of bytes to be stripped from the end of the previous name, >* and the bytes to append to the result, to come up with its name. >*/

Re: GSoC 2019: Git's application submitted

2019-02-13 Thread Elijah Newren
On Sun, Feb 10, 2019 at 9:51 PM Оля Тележная wrote: > > > It would be nice to have a few more project ideas. > > I am not sure I have additional ideas for 3-month project for the intern, but > > > https://git.github.io/SoC-2019-Ideas/ currently lists only 2 possible > > projects: > > > > - Unify r

Re: [PATCH v6 2/2] config: allow giving separate author and committer idents

2019-02-13 Thread Junio C Hamano
William Hubbs writes: > I am writing back onn this thread because I'm not quite sure of the > status. v5 of the patch seemed ok, but there were some changes discussed > that would have created a v6. The v6 changes though were never really > clear. I'm not sure whether I am supposed to be doing so

Re: Git-pull Documentation

2019-02-13 Thread Junio C Hamano
Maris Razvan writes: > I checked and the current behaviour of "git pull " is > to update the remote-tracking branch if required, because, as I have > seen in the code, it just calls "git fetch". The thing is, "git fetch origin next" did *NOT* update remote-tracking branch refs/remotes/origin/ne

Re: [PATCH] rebase: fix regression in rebase.useBuiltin=false test mode

2019-02-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Let's do this for 2.21 then and I'll re-submit the legacy removal > patch after we start 2.22. OK, I would have thought that a prereq to check if the environment is set and skip these problematic tests would be a lot cleaner (primarily because the "legacy remov

Re: [PATCH v3 5/5] blame: add tests for ignoring revisions

2019-02-13 Thread Junio C Hamano
Barret Rhoden writes: > + git rev-parse Y > expect && Not limited to this one, but lose the SP between the redirection operator and its target pathname, i.e. "git rev-parse Y >expect". > + sed -i -e "s/[0-9a-f]/0/g" expect && Don't use "sed -i" in-place rewrite, that is not portable.

[PATCH v2] protocol-capabilities.txt: document symref

2019-02-13 Thread Josh Steadmon
In 7171d8c15f ("upload-pack: send symbolic ref information as capability"), we added a symref capability to the pack protocol, but it was never documented. Adapt the patch notes from that commit and add them to the capabilities documentation. Signed-off-by: Josh Steadmon --- Range-diff against v1

[PATCH] docs/git-rebase: Remove redundant entry in incompatible options list.

2019-02-13 Thread Emilio Cobos Álvarez
The --autosquash option is implied by the earlier --[no-]autosquash entry in the list. Signed-off-by: Emilio Cobos Álvarez --- Documentation/git-rebase.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index daa16403ec..daeaa1d0c7

BUSINESS SOLUTION INVESTMENT FUNDING

2019-02-13 Thread Abdul Aziz,
Hello, Greetings, I represent business group in Middle East looking for projects to fund; we seek any business that will guaranty a safe and secure return on investments. Alternative powers, movies, start up companies etc. We are also looking for commercial building projects, hotels, casino

[ANNOUNCE] Git v2.21.0-rc1

2019-02-13 Thread Junio C Hamano
A release candidate Git v2.21.0-rc1 is now available for testing at the usual places. It is comprised of 464 non-merge commits since v2.20.0, contributed by 60 people, 14 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following pu

Re: [PATCH 10/31] object-store: rename and expand packed_git's sha1 member

2019-02-13 Thread brian m. carlson
On Mon, Feb 11, 2019 at 10:32:15PM -0500, Eric Sunshine wrote: > On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson > wrote: > > This member is used to represent the pack checksum of the pack in > > question. Expand this member to be GIT_MAX_RAWSZ bytes in length so it > > works with longer hashes

What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-13 Thread 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 holding onto them. The first release candidate for th

Re: [PATCH v2] protocol-capabilities.txt: document symref

2019-02-13 Thread Jeff King
On Wed, Feb 13, 2019 at 03:41:28PM -0800, Josh Steadmon wrote: > --- > Range-diff against v1: > 1: 4ffb11ff77 ! 1: cb1b2834b7 protocol-capabilities.txt: document symref > @@ -12,6 +12,17 @@ > diff --git a/Documentation/technical/protocol-capabilities.txt > b/Documentation/technical/pr

Re: What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-13 Thread Jeff King
On Wed, Feb 13, 2019 at 07:33:22PM -0800, Junio C Hamano wrote: > [Graduated to "master"] > [...] > * js/smart-http-detect-remote-error (2019-02-06) 3 commits > (merged to 'next' on 2019-02-06 at ec1a6f67c1) > + t5551: test server-side ERR packet > + remote-curl: tighten "version 2" check for

[PATCH 0/3] some prune optimizations

2019-02-13 Thread Jeff King
Here are two optimizations for git-prune that we've been running at GitHub for ages. No particular reason to share them now; they just finally floated to the top of my todo pile. Do note that I rebased and polished them (and the third one is brand new), so the concepts are proven, but it's possible

[PATCH 1/3] prune: lazily perform reachability traversal

2019-02-13 Thread Jeff King
The general strategy of "git prune" is to do a full reachability walk, then for each loose object see if we found it in our walk. But if we don't have any loose objects, we don't need to do the expensive walk in the first place. This patch postpones that walk until the first time we need to see it

[PATCH 2/3] prune: use bitmaps for reachability traversal

2019-02-13 Thread Jeff King
Pruning generally has to traverse the whole commit graph in order to see which objects are reachable. This is the exact problem that reachability bitmaps were meant to solve, so let's use them (if they're available, of course). Here are timings on git.git: TestHEAD^

[PATCH 3/3] prune: check SEEN flag for reachability

2019-02-13 Thread Jeff King
The git-prune command checks reachability by doing a traversal, and then checking whether a given object exists in the global object hash. This can yield false positives if any other part of the code had to create an object struct for some reason. It's not clear whether this is even possible, but i

Re: [PATCH 04/31] pack-bitmap: replace sha1_to_hex

2019-02-13 Thread Jeff King
On Wed, Feb 13, 2019 at 12:00:07AM +, brian m. carlson wrote: > On Tue, Feb 12, 2019 at 01:37:49AM -0500, Jeff King wrote: > > On Tue, Feb 12, 2019 at 01:22:29AM +, brian m. carlson wrote: > > > -static uint32_t find_object_pos(const unsigned char *sha1) > > > +static uint32_t find_object_

[PATCH 0/10] dropping more unused function parameters

2019-02-13 Thread Jeff King
Here are ten more patches from my exploration of -Wunused-parameters. Most of these are quite old and not urgent, but things seem relatively quiet now, and they all merge cleanly with "pu". In a sense they should all be trivial to review, as they only remove unused parameters. But the thing to con

[PATCH 02/10] diff: drop unused color reset parameters

2019-02-13 Thread Jeff King
Several of the emit_* functions take a "reset" color parameter, but never actually look at it (instead, they call into emit_diff_symbol, which handles the colors itself). Let's drop these unused parameters. Note that emit_line() does still take a color/reset pair, and actually uses it. It cannot b

[PATCH 03/10] diff: drop unused emit data parameter from sane_truncate_line()

2019-02-13 Thread Jeff King
We pass the "struct emit_callback" (which contains all of the context for our diff) into sane_truncate_line(), but that function doesn't actually use it. In theory we might eventually develop a diff option that impacts this, but in the meantime let's not mislead anybody reading the code. Since the

[PATCH 01/10] diff: drop options parameter from diffcore_fix_diff_index()

2019-02-13 Thread Jeff King
The sole purpose of this function is to fix the sorting order of the queued diff entries. It doesn't need to know about any diff options, so we can drop the unused parameter. Signed-off-by: Jeff King --- diff-lib.c | 2 +- diff.c | 2 +- diff.h | 2 +- 3 files changed, 3 insertions(+), 3

[PATCH 04/10] diff: drop complete_rewrite parameter from run_external_diff()

2019-02-13 Thread Jeff King
Our builtin_diff() wants to know whether break-detection found a complete rewrite, because it changes how the diff is shown. However, when calling out to an external diff, we don't pass this information along (and doing so would require designing a new interface to the user-provided program). Let'

Re: What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-13 Thread Junio C Hamano
Jeff King writes: > On Wed, Feb 13, 2019 at 07:33:22PM -0800, Junio C Hamano wrote: > >> [Graduated to "master"] >> [...] >> * js/smart-http-detect-remote-error (2019-02-06) 3 commits >> (merged to 'next' on 2019-02-06 at ec1a6f67c1) >> + t5551: test server-side ERR packet >> + remote-curl: t

[PATCH 05/10] merge-recursive: drop several unused parameters

2019-02-13 Thread Jeff King
There are a few functions related to directory renames that have unused parameters. After consulting with the author in [1], these seem to be leftover cruft from the development process, and not signs of any bug. Let's drop them. [1] https://public-inbox.org/git/cabpp-bhobf8wbbsxf97scnqczkxqukzio

[PATCH 07/10] files-backend: drop refs parameter from split_symref_update()

2019-02-13 Thread Jeff King
This parameter was added in fcc42ea0c9 (split_symref_update(): add a files_ref_store argument, 2016-09-04) without comment, but never used. The splitting is purely mechanical, and doesn't depend on the particular ref-store. Let's drop this parameter in the name of simplicity. Signed-off-by: Jeff K

[PATCH 06/10] pack-objects: drop unused parameter from oe_map_new_pack()

2019-02-13 Thread Jeff King
Since 43fa44fa3b (pack-objects: move in_pack out of struct object_entry, 2018-04-14), we store the source pack for each object as a small index rather than as a pointer. When we see a new pack that has no allocated index, we fall back to generating an array of pointers by calling oe_map_new_pack().

[PATCH 08/10] ref-filter: drop unused buf/sz pairs

2019-02-13 Thread Jeff King
The grab_tag_values() and grab_commit_values() functions take both the "struct object" as well as the buf/sz pair for the actual object bytes. However, neither function uses the latter, as they pull the data directly from the parsed object struct. Let's get rid of these misleading parameters. Sig

Re: What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-13 Thread Jeff King
On Wed, Feb 13, 2019 at 09:49:13PM -0800, Junio C Hamano wrote: > > I'm not worried enough to suggest pulling it back, but it's something we > > should keep an eye on during the -rc period. > > True. I actually think that it is probably a good idea to unleash > this kind of thing as quickly as p

[PATCH 10/10] ref-filter: drop unused "sz" parameters

2019-02-13 Thread Jeff King
Many of our grab_* functions, which parse the object content, take a buf/sz pair of the object bytes. However, the functions which actually parse the buffers (like find_wholine() and find_subpos()) never look at "sz", and instead use functions like strchr() and strchrnul() that assume the result is

[PATCH 09/10] ref-filter: drop unused "obj" parameters

2019-02-13 Thread Jeff King
The grab_person() and grab_sub_body_contents() functions take both an object struct and a buf/sz pair of the object bytes. However, they use only the latter, since "struct object" does not contain the parsed ident (nor the whole commit message, of course). Let's get rid of these misleading "struct

Re: [RFC PATCH] pack-refs: fail on falsely sorted packed-refs

2019-02-13 Thread Jeff King
On Wed, Feb 13, 2019 at 11:08:01AM +0100, Ævar Arnfjörð Bjarmason wrote: > > I happened to have a not really sorted packed-refs file. As you might guess, > > it was quite wtf-ing experience. It worked, mostly, but there was one branch > > which just did not resolve, regardless of existing and bein

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-13 Thread Todd Zullinger
SZEDER Gábor wrote: > On Sat, Feb 09, 2019 at 06:05:53PM -0500, Todd Zullinger wrote: >> SZEDER Gábor wrote: >>> Just curious: how did you noticed the missing GPGSM prereq? >> >> I just grep the build output for '# SKIP|skipped:' and then >> filter out those which I expect (thing like MINGW and >>

[PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

2019-02-13 Thread Todd Zullinger
07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings from Apache when the variable is unset, as we do for GIT_VALGRIND* and GIT_TRACE, from f628825481 ("t/lib-httpd: handle running under --valgrind", 2012-07-24)

Re: What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-13 Thread Todd Zullinger
Jeff King wrote: > Yeah, I do have the feeling that not many people really exercise our -rc > candidates. I'm not sure how to improve that. We could try to push > packagers to make them available (and I think Jonathan already does for > Debian's "experimental" track). Similarly, I try to make them

Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

2019-02-13 Thread Jeff King
On Thu, Feb 14, 2019 at 01:35:13AM -0500, Todd Zullinger wrote: > 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added > GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings > from Apache when the variable is unset, as we do for GIT_VALGRIND* and > GIT_TRACE, from

Re: What's cooking in git.git (Feb 2019, #03; Wed, 13)

2019-02-13 Thread Jeff King
On Thu, Feb 14, 2019 at 01:49:56AM -0500, Todd Zullinger wrote: > Jeff King wrote: > > Yeah, I do have the feeling that not many people really exercise our -rc > > candidates. I'm not sure how to improve that. We could try to push > > packagers to make them available (and I think Jonathan already

Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

2019-02-13 Thread Todd Zullinger
Jeff King wrote: > On Thu, Feb 14, 2019 at 01:35:13AM -0500, Todd Zullinger wrote: > >> 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added >> GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings >> from Apache when the variable is unset, as we do for GIT_VALGRIN

Re: [PATCH v2 3/3] submodule: document default behavior

2019-02-13 Thread Denton Liu
On Wed, Feb 13, 2019 at 10:39:48AM -0800, Junio C Hamano wrote: > Denton Liu writes: > > diff --git a/Documentation/git-submodule.txt > > b/Documentation/git-submodule.txt > > index 65a952fb96..2fdf9f4cf3 100644 > > --- a/Documentation/git-submodule.txt > > +++ b/Documentation/git-submodule.txt >