Re: [PATCH v4 2/2] launch_editor(): indicate that Git waits for user input

On Friday 01 December 2017 11:59 PM, Jeff King wrote: On Fri, Dec 01, 2017 at 01:52:14PM +0100, Lars Schneider wrote: Thanks for the review :-) Actually, I meant to bikeshed one part but forgot. ;) + fprintf(stderr, _("hint: Waiting for your editor input...")); I

Re: UNITED NATION COMPENSATIONS,

Re:Hello Dear, What has actually kept you waiting to claim your fund $870.000.00 since then? Your fund has been approved since and nobody has heard from you. hurry and get back to me with your valid receiving data immediately you receive this mail to avoid error procedures because the United

Re: [PATCH] git-gui: allow Ctrl+T to toggle multiple paths (Re: [BUG] git gui can't commit multiple files)

Jonathan Nieder wrote: > From: Johannes Schindelin > Subject: git-gui: allow Ctrl+T to toggle multiple paths > > In the Unstaged Changes panel, selecting multiple lines (using > shift+click) and pressing ctrl+t to stage them causes one file to be > staged instead of

[PATCH] git-gui: allow Ctrl+T to toggle multiple paths (Re: [BUG] git gui can't commit multiple files)

From: Johannes Schindelin Subject: git-gui: allow Ctrl+T to toggle multiple paths In the Unstaged Changes panel, selecting multiple lines (using shift+click) and pressing ctrl+t to stage them causes one file to be staged instead of all of the selected files. The same

[PATCH v2 1/2] git-prompt: make __git_eread intended use explicit

__git_eread is used to read a single line of a given file (if it exists) into a variable without the EOL. All six current users of __git_eread use it that way and don't expect multi-line content. Thus, add a comment and explicitly use $2 instead of shifting the args down and using $@.

[PATCH v2 2/2] git-prompt: fix reading files with windows line endings

If any of the files read by __git_eread have \r\n line endings, read will only strip \n, leaving \r. This results in an ugly prompt, where instead of user@pc MINGW64 /path/to/repo (BARE:master) the last parenthesis is printed over the beginning of the prompt like )ser@pc MINGW64

[WIP 2/2] submodule: read-only super-backed ref backend

Note that a few major parts are still missing: - special handling of the current branch of the superproject - writing (whether "refs/..." to the superproject as an index change or a commit, or non-"refs/..." directly to the subproject like usual) Signed-off-by: Jonathan Tan

[WIP 0/2] Submodule ref backend that mirrors superproject

I sent out an earlier email [1] that discusses the idea of a submodule ref backend that mirrors the superproject. Basically, if this backend is used (for example, through a configuration option), the submodule itself will not store any "refs/..." refs, but will check the gitlink of the commit of

[WIP 1/2] submodule: refactor acquisition of superproject info

Signed-off-by: Jonathan Tan --- submodule.c | 76 + submodule.h | 3 +++ 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/submodule.c b/submodule.c index bb531e0e5..ce511180e 100644 ---

Re: [PATCH] sha1_file: use strbuf_add() instead of strbuf_addf()

On Fri, Dec 01, 2017 at 02:50:05PM -0500, Derrick Stolee wrote: > > > + baselen = path->len; > > We set this here so that the '/' is included as part of the base. Makes > > sense, but can we now drop the earlier setting of baselen before the > > opendir() call? > > Yeah, probably. I had briefly

[PATCH] l10n: update de_DE translation

Der-, die- and dasselbe and their declensions are spelt as one word in German. Signed-off-by: Robert Abel --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index a05aca5f3..400262625 100644 --- a/po/de.po +++

Re: git-clone ignores submodule.recurse configuration

On 12/01, Ralf Thielow wrote: > Today I played around a bit with git submodules and noticed > that the very handy configuration "submodule.recurse" is not > working for the git-clone command. > > "git help config" tells me that submodule.recurse affects > all commands that have a

Re: [BUG] git gui can't commit multiple files

Originally I had this problem in gentoo and assumed in the end it's likely due to my specific configuration. However recently I switched to nixos and am still experiencing it. I've search again if I can find anything and lo and behold, it's already fixed in the *windows* version of git-gui...

Re: [PATCH v2 2/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test

Todd Zullinger wrote: > Reviewed-by: Jonathan Nieder > Signed-off-by: Todd Zullinger > --- > t/lib-git-svn.sh | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) This and the previous one are indeed still Reviewed-by: Jonathan Nieder

Re: [PATCH] sha1_file: use strbuf_add() instead of strbuf_addf()

On 12/1/2017 1:22 PM, Jeff King wrote: On Fri, Dec 01, 2017 at 12:49:56PM -0500, Derrick Stolee wrote: [snip] diff --git a/sha1_file.c b/sha1_file.c index 8ae6cb6285..2160323c4a 100644 This overall looks good, but I noticed one bug and a few cosmetic improvements. Thanks for finding quality

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

On Dez 01 2017, Dan Jacques wrote: > I am not a `sed` wizard, but perhaps the tool is ignoring the semicolon > because > it's in the middle of the "s" expression? The shell may similarly be ignoring > it > because it's nested in between single-quotes? As far as POSIX is

git-clone ignores submodule.recurse configuration

Today I played around a bit with git submodules and noticed that the very handy configuration "submodule.recurse" is not working for the git-clone command. "git help config" tells me that submodule.recurse affects all commands that have a --recurse-submodules option. git-clone seems to be an

[no subject]

The United Nations, World Bank-Group and International Monetary Fund have agreed to compensate you with the sum of One Million Five Hundred Thousand US Dollars contact us for cliams

RE: [RFE] Inverted sparseness

On December 1, 2017 1:19 PM, Jeff Hostetler wrote: >On 12/1/2017 12:21 PM, Randall S. Becker wrote: >> I recently encountered a really strange use-case relating to sparse >> clone/fetch that is really backwards from the discussion that has been going >> on, and well, I'm a bit embarrassed to

Re: [PATCH v4 2/2] launch_editor(): indicate that Git waits for user input

On Fri, Dec 01, 2017 at 01:52:14PM +0100, Lars Schneider wrote: > > These are obviously the result of devils-advocate poking at the feature. > > I doubt any editor would end its output with a CR. But the first case is > > probably going to be common, especially for actual graphical editors. We >

Re: How hard would it be to implement sparse fetching/pulling?

Jeff Hostetler wrote: > On 11/30/2017 6:43 PM, Philip Oakley wrote: >> The 'companies' problem is that it tends to force a client-server, always-on >> on-line mentality. I'm also wanting the original DVCS off-line capability to >> still be available, with _user_ control, in a generic sense, of

Re: [PATCH] sha1_file: use strbuf_add() instead of strbuf_addf()

On Fri, Dec 01, 2017 at 12:49:56PM -0500, Derrick Stolee wrote: > Replace use of strbuf_addf() with strbuf_add() when enumerating > loose objects in for_each_file_in_obj_subdir(). Since we already > check the length and hex-values of the string before consuming > the path, we can prevent extra

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

On Fri, 1 Dec 2017, Johannes Sixt wrote: >>> This doesn't work, unfortunately. When $(pathsep) is ';', we get an >>> incomplete sed expression because ';' is also a command separator in the >>> sed language. >> >> Funny, I tried this also with ';' as pathsep, and it worked in the Git for >>

Re: [RFE] Inverted sparseness

On 12/1/2017 12:21 PM, Randall S. Becker wrote: I recently encountered a really strange use-case relating to sparse clone/fetch that is really backwards from the discussion that has been going on, and well, I'm a bit embarrassed to bring it up, but I have no good solution including building

Re: How hard would it be to implement sparse fetching/pulling?

Hi, Jeff Hostetler wrote: > On 11/30/2017 3:03 PM, Jonathan Nieder wrote: >> One piece of missing functionality that looks intereseting to me: that >> series batches fetches of the missing blobs involved in a "git >> checkout" command: >> >>

[PATCH] sha1_file: use strbuf_add() instead of strbuf_addf()

Replace use of strbuf_addf() with strbuf_add() when enumerating loose objects in for_each_file_in_obj_subdir(). Since we already check the length and hex-values of the string before consuming the path, we can prevent extra computation by using the lower- level method. One consumer of

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

Am 01.12.2017 um 18:13 schrieb Johannes Schindelin: Hi Hannes, On Fri, 1 Dec 2017, Johannes Sixt wrote: Am 29.11.2017 um 16:56 schrieb Dan Jacques: @@ -1989,6 +1986,15 @@ GIT-PERL-DEFINES: FORCE echo "$$FLAGS" >$@; \ fi +GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE)

Re: [SCRIPT/RFC 0/3] git-commit --onto-parent (three-way merge, no working tree file changes)

Am 30.11.2017 um 00:10 schrieb Igor Djordjevic: On 29/11/2017 20:11, Johannes Sixt wrote: With git-post, I make a fixup commit commit on the integration branch, then `git post B && git merge B`: ...A...C <- topics A, C \ \ ---o---o---o---o---f---F<-

Re: How hard would it be to implement sparse fetching/pulling?

On 11/30/2017 6:43 PM, Philip Oakley wrote: From: "Vitaly Arbuzov" [...] comments below.. On Thu, Nov 30, 2017 at 9:01 AM, Vitaly Arbuzov wrote: Hey Jeff, It's great, I didn't expect that anyone is actively working on this. I'll check out your branch,

[RFE] Inverted sparseness

I recently encountered a really strange use-case relating to sparse clone/fetch that is really backwards from the discussion that has been going on, and well, I'm a bit embarrassed to bring it up, but I have no good solution including building a separate data store that will end up inconsistent

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

Hi Hannes, On Fri, 1 Dec 2017, Johannes Sixt wrote: > Am 29.11.2017 um 16:56 schrieb Dan Jacques: > > @@ -1989,6 +1986,15 @@ GIT-PERL-DEFINES: FORCE > > echo "$$FLAGS" >$@; \ > >fi > > +GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES perl/perl.mak > > Makefile > >

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

Am 29.11.2017 um 16:56 schrieb Dan Jacques: @@ -1989,6 +1986,15 @@ GIT-PERL-DEFINES: FORCE echo "$$FLAGS" >$@; \ fi +GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES perl/perl.mak Makefile + $(QUIET_GEN)$(RM) $@ && \ + INSTLIBDIR=`MAKEFLAGS=

Re: What's cooking in git.git (Nov 2017, #08; Tue, 28)

On 11/28/2017 8:17 PM, Junio C Hamano wrote: [Cooking] * jh/object-filtering (2017-11-22) 6 commits (merged to 'next' on 2017-11-27 at e5008c3b28) + pack-objects: add list-objects filtering + rev-list: add list-objects filtering support + list-objects: filter objects in

Re: How hard would it be to implement sparse fetching/pulling?

On 11/30/2017 3:03 PM, Jonathan Nieder wrote: Hi Vitaly, Vitaly Arbuzov wrote: Found some details here: https://github.com/jeffhostetler/git/pull/3 Looking at commits I see that you've done a lot of work already, including packing, filtering, fetching, cloning etc. What are some areas that

[PATCH v2 2/2] t/lib-git-svn.sh: improve svnserve tests with parallel make test

Setting SVNSERVE_PORT enables several tests which require a local svnserve daemon to be run (in t9113 & t9126). The tests share setup of the local svnserve via `start_svnserve()`. The function uses svnserve's `--listen-once` option, which causes svnserve to accept one connection on the port,

[PATCH v2 1/2] t/lib-git-svn: cleanup inconsistent tab/space usage

Acked-by: Eric Wong Reviewed-by: Jonathan Nieder Signed-off-by: Todd Zullinger --- t/lib-git-svn.sh | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index

Re: jn/reproducible-build, was Re: What's cooking in git.git (Nov 2017, #08; Tue, 28)

> On 01 Dec 2017, at 15:32, Johannes Schindelin > wrote: > > Hi Junio & Jonathan (Nieder, there is another active Jonathan again), > > On Wed, 29 Nov 2017, Junio C Hamano wrote: > >> * jn/reproducible-build (2017-11-22) 3 commits >> (merged to 'next' on

Re: How hard would it be to implement sparse fetching/pulling?

On 11/30/2017 12:44 PM, Vitaly Arbuzov wrote: Found some details here: https://github.com/jeffhostetler/git/pull/3 Looking at commits I see that you've done a lot of work already, including packing, filtering, fetching, cloning etc. What are some areas that aren't complete yet? Do you need

Re: How hard would it be to implement sparse fetching/pulling?

On 11/30/2017 12:01 PM, Vitaly Arbuzov wrote: Hey Jeff, It's great, I didn't expect that anyone is actively working on this. I'll check out your branch, meanwhile do you have any design docs that describe these changes or can you define high level goals that you want to achieve? There are

jn/reproducible-build, was Re: What's cooking in git.git (Nov 2017, #08; Tue, 28)

Hi Junio & Jonathan (Nieder, there is another active Jonathan again), On Wed, 29 Nov 2017, Junio C Hamano wrote: > * jn/reproducible-build (2017-11-22) 3 commits > (merged to 'next' on 2017-11-27 at 6ae6946f8c) > + Merge branch 'jn/reproducible-build' of ../git-gui into >

Re: How hard would it be to implement sparse fetching/pulling?

On 11/30/2017 8:51 PM, Vitaly Arbuzov wrote: I think it would be great if we high level agree on desired user experience, so let me put a few possible use cases here. 1. Init and fetch into a new repo with a sparse list. Preconditions: origin blah exists and has a lot of folders inside of src

Re: What's cooking in git.git (Nov 2017, #08; Tue, 28)

> On 29 Nov 2017, at 02:17, Junio C Hamano wrote: > > * jc/editor-waiting-message (2017-11-17) 1 commit > - launch_editor(): indicate that Git waits for user input > > Git shows a message to tell the user that it is waiting for the > user to finish editing when spawning an

jt/diff-anchored-patience, was Re: What's cooking in git.git (Nov 2017, #08; Tue, 28)

Hi Junio, On Wed, 29 Nov 2017, Junio C Hamano wrote: > * jt/diff-anchored-patience (2017-11-28) 1 commit > - diff: support anchoring line(s) > > "git diff" learned a variant of the "--patience" algorithm, to > which the user can specify which 'unique' line to be used as > anchoring points.

cc/require-tcl-tk-for-build, was Re: What's cooking in git.git (Nov 2017, #08; Tue, 28)

Hi Junio, On Wed, 29 Nov 2017, Junio C Hamano wrote: > * cc/require-tcl-tk-for-build (2017-11-27) 1 commit > - Makefile: check that tcl/tk is installed > > A first-time builder of Git may have installed neither tclsh nor > msgfmt, in which case git-gui and gitk part will fail and break the >

Re: What's cooking in git.git (Nov 2017, #08; Tue, 28)

Hi Junio, On Wed, 29 Nov 2017, Junio C Hamano wrote: > * tz/complete-branch-copy (2017-11-17) 1 commit > (merged to 'next' on 2017-11-20 at 6d22384fcd) > + completion: add '--copy' option to 'git branch' > > Command line completion (in contrib/) has been taught about the > "--copy" option

Re: [PATCH v4 2/2] launch_editor(): indicate that Git waits for user input

> On 30 Nov 2017, at 21:51, Jeff King wrote: > > On Wed, Nov 29, 2017 at 03:37:52PM +0100, lars.schnei...@autodesk.com wrote: > ... >> The standard advise() function is not used here as it would always add >> a newline which would make deleting the message harder. > > I tried to

Re: git-p4: cloning with a change number does not import all files

> On 29 Nov 2017, at 04:48, Patrick Rouleau wrote: > > Hi, > > On Mon, Nov 27, 2017 at 7:52 AM, Lars Schneider > wrote: >> >> what is your goal here? Do you want to convert the repo to Git or do you >> want to use Git to interact with a P4

Aborting a merge will delete new files added

Hi! While sorting out a merge conflict I accidentally added an untracked folder to the index. Later I decided to abort the merge with `git merge --abort` and I expected it to unstage the untracked file but it instead removed it. This was not what I expected. Cheers, Pärham

Re: [PATCH] git-prompt: fix reading files with windows line endings

Hi Robert, On Thu, 30 Nov 2017, Robert Abel wrote: > On 30 Nov 2017 16:21, Johannes Schindelin wrote: > > On Thu, 30 Nov 2017, Robert Abel wrote: > >> So reading a dummy variable along with the actual content variable > >> works for git-prompt: > >> > >> __git_eread () > >> { > >>