git reset of addition of a submodule?

git submodule add https://my-git-repo blort git commit -m 'add a submodule' git reset HEAD^ blort The reset deletes the gitlink, but does not delete the entry in .gitmodules. On one hand, this is exactly what the user asked for -- they wanted the path 'blort' to be changed in the index, and

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

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? On Thu, Nov 30, 2017 at 6:24 AM, Jeff Hostetler

Re: [PATCH V4] config: add --expiry-date

On Thu, Nov 30, 2017 at 12:18:49PM +0100, Heiko Voigt wrote: > > Fine by me. While I think the original intent was to be more lenient to > > malformed .gitmodules, it's not like we're seeing bug reports about it. > > My original intent was not about being more lenient about malformed >

Re: [PATCH] imap-send: URI encode server folder

On Thu, Nov 30, 2017 at 5:07 AM, Nicolas Morey-Chaisemartin wrote: > URI encode the server folder string before passing it to libcurl. > This fixes the access to the draft folder on Gmail accounts (named > [Gmail]/Drafts) For someone reading this commit message in

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

Hi Johannes, 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 () >> { >> local f="$1" >> local dummy >> shift

Re: git reset of addition of a submodule?

On Thu, 2017-11-30 at 12:05 -0500, David Turner wrote: > git submodule add https://my-git-repo blort > git commit -m 'add a submodule' > git reset HEAD^ blort > > The reset deletes the gitlink, but does not delete the entry in > .gitmodules.  On one hand, this is exactly what the user asked for

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

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 any help with implementation? On Thu, Nov 30, 2017

Re: [PATCH] Makefile: replace perl/Makefile.PL with simple make rules

On Thu, Nov 30 2017, Jonathan Nieder jotted: > Hi, > > Ævar Arnfjörð Bjarmason wrote: > >> Replace the perl/Makefile.PL and the fallback perl/Makefile used under >> NO_PERL_MAKEMAKER=NoThanks with a much simpler implementation heavily >> inspired by how the i18n infrastructure's build process

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

Le 30/11/2017 à 03:04, Jonathan Nieder a écrit : > (+cc: Nicolas) > Hi, > > Doron Behar wrote: > >> I'm trying to send a patch with the command `git imap-send`, I used the >> examples in the manual page as the main reference for my configuration: >> >> ``` >> [imap] >> folder =

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

Le 30/11/2017 à 10:39, Nicolas Morey-Chaisemartin a écrit : > > Le 30/11/2017 à 03:04, Jonathan Nieder a écrit : >> (+cc: Nicolas) >> Hi, >> >> Doron Behar wrote: >> >>> I'm trying to send a patch with the command `git imap-send`, I used the >>> examples in the manual page as the main reference

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

Le 30/11/2017 à 10:46, Daniel Stenberg a écrit : > On Thu, 30 Nov 2017, Nicolas Morey-Chaisemartin wrote: > >> This is due to the weird "[Gmail]" prefix in the folder. >> I tried manually replacing it with: >>     folder = %5BGmail%5D/Drafts >> in .git/config and it works. >> >> curl is

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

On Thu, 30 Nov 2017, Nicolas Morey-Chaisemartin wrote: It would make sense to have a way to ask libcurl to URI encode for us. I'm guessing there's already the code for that somewhere in curl and we would be wise to use it. But to work wqith older version we'll have to do it ourselves anyway.

[PATCH] imap-send: URI encode server folder

URI encode the server folder string before passing it to libcurl. This fixes the access to the draft folder on Gmail accounts (named [Gmail]/Drafts) Reported-by: Doron Behar Signed-off-by: Nicolas Morey-Chaisemartin --- imap-send.c | 8

[PATCH] doc: clarify triangular workflow

Changed the documentation about the triangular workflow because it was not clear enough for a new contributor. With a clearer and more precise documentation, any new Git contributors will spend less time on understanding this doc and the way Git works. Based-on-patch-by: Jordan DE GEA

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

On Thu, 30 Nov 2017, Nicolas Morey-Chaisemartin wrote: This is due to the weird "[Gmail]" prefix in the folder. I tried manually replacing it with:     folder = %5BGmail%5D/Drafts in .git/config and it works. curl is doing some fancy handling with brackets and braces. It make sense for

Re: "git describe" documentation and behavior mismatch

On Thu, Nov 30, 2017 at 7:47 PM, Daniel Knittl-Frank wrote: > […] > > Running the above commands in the git.git repository yields a different > result: > >> $ git describe --all --abbrev=4 v1.0.5^2 >> v1.0.0-21-g975b3 > > No "reference path" to see. It is however

Re: [PATCH v4 1/2] refactor "dumb" terminal determination

On Wed, Nov 29, 2017 at 03:37:51PM +0100, lars.schnei...@autodesk.com wrote: > From: Lars Schneider > > Move the code to detect "dumb" terminals into a single location. This > avoids duplicating the terminal detection code yet again in a subsequent > commit. Makes

"git describe" documentation and behavior mismatch

Hi Git list, the help page/manpage of the git describe command has an example with the --all flag which should prepend the ref namespace (tags/ or heads/): > With --all, the command can use branch heads as references, so the output > shows the reference path as well: > > [torvalds@g5

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

On Wed, Nov 29, 2017 at 06:35:16PM +, Thomas Adam wrote: > On Wed, Nov 29, 2017 at 03:37:50PM +0100, lars.schnei...@autodesk.com wrote: > > + if (print_waiting_for_editor) { > > + fprintf(stderr, _("hint: Waiting for your editor > > input...")); > >

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

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 aren't complete yet? Do you need any help

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

On Wed, Nov 29, 2017 at 03:37:52PM +0100, lars.schnei...@autodesk.com wrote: > No message is printed in a "dumb" terminal as it would not be possible > to remove the message after the editor returns. This should not be a > problem as this feature is targeted at novice Git users and they are >

Re: [PATCH] Makefile: replace perl/Makefile.PL with simple make rules

Jonathan Nieder wrote: > Yeah, people really do use Git.pm as an external API. Yikes :< > If we want to prevent this, then we should not be installing it in the > public perl module path. Or we should at least add a note to the > manpages we ship :) to recommend not using

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

On Thu, Nov 30, 2017 at 03:12:17PM -0500, Jeff King wrote: > On Wed, Nov 29, 2017 at 06:35:16PM +, Thomas Adam wrote: > > > On Wed, Nov 29, 2017 at 03:37:50PM +0100, lars.schnei...@autodesk.com wrote: > > > + if (print_waiting_for_editor) { > > > + fprintf(stderr,

Re: [PATCH] Makefile: replace perl/Makefile.PL with simple make rules

Ævar Arnfjörð Bjarmason wrote: > On Thu, Nov 30 2017, Jonathan Nieder jotted: >> Ævar Arnfjörð Bjarmason wrote: >>> * We don't build the Git(3) Git::I18N(3) etc. man pages from the >>>embedded perldoc. I suspect nobody really cares, these are mostly >>>internal APIs, and if someone's

Re: [PATCH v5 4/6] list-objects: filter objects in traverse_commit_list

On Mon, Nov 27, 2017 at 02:39:43PM -0500, Jeff Hostetler wrote: > On 11/22/2017 5:56 PM, Stefan Beller wrote: > > On Tue, Nov 21, 2017 at 12:58 PM, Jeff Hostetler > > wrote: > > > + assert(arg); > > > + assert(!unset); > > > > I count 16 asserts in this

Re: [PATCH] Makefile: replace perl/Makefile.PL with simple make rules

On Wed, Nov 29, 2017 at 07:54:30PM +, Ævar Arnfjörð Bjarmason wrote: > Replace the perl/Makefile.PL and the fallback perl/Makefile used under > NO_PERL_MAKEMAKER=NoThanks with a much simpler implementation heavily > inspired by how the i18n infrastructure's build process works[1]. I'm very

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

Jonathan, thanks for references, that is super helpful, I will follow your suggestions. Philip, I agree that keeping original DVCS off-line capability is an important point. Ideally this feature should work even with remotes that are located on the local disk. Which part of Jeff's work do you

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

On Thu, Nov 30, 2017 at 2:51 AM, Johannes Schindelin wrote: > On Thu, 30 Nov 2017, SZEDER Gábor wrote: > >> > > diff --git a/contrib/completion/git-prompt.sh >> > > b/contrib/completion/git-prompt.sh >> > > index c6cbef38c2..71a64e7959 100644 >> > > ---

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

On Nov 27, 2017, at 00:35, Igor Djordjevic wrote: > Approach discussed here could have a few more useful applications, > but one seems to be standing out the most - in case where multiple > topic branches are temporarily merged for integration testing, it > could

Re: [PATCH v3] diff: support anchoring line(s)

On Thu, 30 Nov 2017 01:36:37 +0100 (CET) Johannes Schindelin wrote: > Hi Jonathan, > > On Tue, 28 Nov 2017, Jonathan Tan wrote: > > > @@ -4607,7 +4627,14 @@ int diff_opt_parse(struct diff_options *options, > > DIFF_XDL_CLR(options, NEED_MINIMAL); > >

Mutual Coperation thank you

-- Dear Friend, I know that this message will come to you as a surprise. I am the Auditing and Accounting section manager with African Development Bank, Ouagadougou Burkina faso. I Hope that you will not expose or betray this trust and confident that I am about to repose on you for the mutual

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

From: "Vitaly Arbuzov" 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 any help

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

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 including "bar". Actions: git init foo && cd foo

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

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

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

These tests are not run by default nor are they enabled in travis-ci. I don't know how much testing they get in user or other packager builds. I've been slowly increasing the test suite usage in fedora builds. I ran into this while testing locally with parallel make test. The official fedora

[PATCH 1/2] t/lib-git-svn: whitespace cleanup

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 688313ed5c..84366b2624 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -17,8 +17,8 @@

Re: [PATCH 1/2] t/lib-git-svn: whitespace cleanup

Todd Zullinger wrote: > Subject: t/lib-git-svn: whitespace cleanup > > Signed-off-by: Todd Zullinger > --- > t/lib-git-svn.sh | 22 +++--- > 1 file changed, 11 insertions(+), 11 deletions(-) Reviewed-by: Jonathan Nieder Thanks. nit: it

Re: [PATCH v4 1/2] refactor "dumb" terminal determination

On Wednesday 29 November 2017 08:07 PM, lars.schnei...@autodesk.com wrote: +int is_terminal_dumb(void) +{ + const char *terminal = getenv("TERM"); + return !terminal || !strcmp(terminal, "dumb"); So, IIUC, there terminal is considered to be 'dumb' when the TERM environment

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

Makes sense, I think this perfectly aligns with our needs too. Let me dive deeper into those patches and previous discussions, that you've kindly shared above, so I better understand details. I'm very excited about what you guys already did, it's a big deal for the community! On Thu, Nov 30,

I wait for your prompt response.

Good day, I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look for foreign partner who will assist him to invest the sum of Fifty Million Dollars ($50,000,000) in your country. He has investment interest in mining, exotic properties for commercial resident, development

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

Hi Vitaly, 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. I think one thing this thread is pointing to is a lack of overview documentation about how the 'partial clone' series currently works.

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

Hi, Todd Zullinger wrote: > Previously, setting SVNSERVE_PORT enabled several tests which require a > local svnserve daemon to be run (in t9113 & t9126). The tests share the > setup of the local svnserve via `start_svnserve()`. The function uses > the svnserve option `--listen-once` which

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

Todd Zullinger wrote: > These tests are not run by default nor are they enabled in travis-ci. I > don't know how much testing they get in user or other packager builds. > > I've been slowly increasing the test suite usage in fedora builds. I > ran into this while testing locally with parallel

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

Hi Eric, Eric Wong wrote: I'm fine with this for now. Since svnserve (and git-daemon) both support inetd behavior, I think we can eventually have a test helper which binds random ports and pretends to be an inetd, letting the test run without any special setup. It would let multiple test

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

Hi Jonathan, Jonathan Nieder wrote: Todd Zullinger wrote: These tests are not run by default nor are they enabled in travis-ci. I don't know how much testing they get in user or other packager builds. I've been slowly increasing the test suite usage in fedora builds. I ran into this while

Re: [PATCH 1/2] t/lib-git-svn: whitespace cleanup

Hi Jonathan, Jonathan Nieder wrote: nit: it would have been a tiny bit easier to review if the commit message mentioned that this is only changing the indentation from an inconsistent space/tab mixture to tabs and isn't making any other changes. If only you saw how many times I typed a

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

On Thu, 2017-11-30 at 16:13 +0100, Andreas Schwab wrote: > On Nov 30 2017, Thomas Adam wrote: > > > On Thu, Nov 30, 2017 at 02:55:35PM +0100, Lars Schneider wrote: > > > > > > > On 29 Nov 2017, at 19:35, Thomas Adam wrote: > > > > > > > > On Wed, Nov 29,

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

Hi Jonathan, Jonathan Nieder wrote: Todd Zullinger wrote: Previously, setting SVNSERVE_PORT enabled several tests which require a local svnserve daemon to be run (in t9113 & t9126). The tests share the setup of the local svnserve via `start_svnserve()`. The function uses the svnserve option

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

On Friday 01 December 2017 02:21 AM, Jeff King 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 know that emacsclient

Re: [PATCH 1/2] t/lib-git-svn: whitespace cleanup

Todd Zullinger wrote: > Jonathan Nieder wrote: >> nit: it would have been a tiny bit easier to review if the commit >> message mentioned that this is only changing the indentation from an >> inconsistent space/tab mixture to tabs and isn't making any other >> changes. > > If only you saw how many

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

Jonathan Nieder wrote: Yep, with this description it is Reviewed-by: Jonathan Nieder Thanks for putting up with my nits. :) Thank you for taking the time and looking at the details. :) I'll send a v2 with the changes in the morning, in case there are any other comments

Re: [ANNOUNCE] Git for Windows 2.15.1(2), was Re:Git for Windows 2.15.1

Am 30.11.2017 um 02:50 schrieb Johannes Schindelin: > Hi all, > > unfortunately, a last-minute bug slipped in: MSYS2 updated vim (including > its defaults.vim, in a way that interacted badly with Git for Windows' > configuration). The result was that an ugly warning is shown every time a > user

Re: [git-users] How hard would it be to implement sparse fetching/pulling?

On Wed, Nov 29, 2017 at 06:42:54PM -0800, vit via Git for human beings wrote: > I'm looking for ways to improve fetch/pull/clone time for large git > (mono)repositories with unrelated source trees (that span across multiple > services). > I've found sparse checkout approach appealing and

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

On Nov 30 2017, Thomas Adam wrote: > On Thu, Nov 30, 2017 at 02:55:35PM +0100, Lars Schneider wrote: >> >> > On 29 Nov 2017, at 19:35, Thomas Adam wrote: >> > >> > On Wed, Nov 29, 2017 at 03:37:50PM +0100, lars.schnei...@autodesk.com >> > wrote: >> >> +

Google winning

Dear Google Award Winner You have been award £500,000 Gbp from google award promotion 2017. Kindly reply for more winning information and for claim. Regards, Google Lottery Board.

Bare repository fetch/push race condition

It looks like there is a race condition between fetch and push in a bare repository in the following setup. There is a bare git repository on a local file system. Some process pushes to this repository via jgit. There is a cron task which pushes this repository to the backup remote repo over ssh.

Re: Make patch-id more flexible?

Hello Junio, > > file-names. Here comes my actual question. Would it be conceptually fine > > to implement some `git patch-id` parameter, which would allow ignoring > > the file-names (or reducing those to their `basename`) before computing > > the patch id? Or would it break the concept of patch

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

On 11/29/2017 10:16 PM, Vitaly Arbuzov wrote: Hi guys, I'm looking for ways to improve fetch/pull/clone time for large git (mono)repositories with unrelated source trees (that span across multiple services). I've found sparse checkout approach appealing and helpful for most of client-side

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

On Thu, Nov 30, 2017 at 02:55:35PM +0100, Lars Schneider wrote: > > > On 29 Nov 2017, at 19:35, Thomas Adam wrote: > > > > On Wed, Nov 29, 2017 at 03:37:50PM +0100, lars.schnei...@autodesk.com wrote: > >> + if (print_waiting_for_editor) { > >> +

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

> On 29 Nov 2017, at 19:35, Thomas Adam wrote: > > On Wed, Nov 29, 2017 at 03:37:50PM +0100, lars.schnei...@autodesk.com wrote: >> +if (print_waiting_for_editor) { >> +fprintf(stderr, _("hint: Waiting for your editor >> input...")); >>

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

Hi Robert, 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 () > { > local f="$1" > local dummy > shift > test -r "$f" && IFS=$'\r\n' read "$@" dummy <

Re: [git-users] How hard would it be to implement sparse fetching/pulling?

On 11/30/2017 3:12 AM, Konstantin Khomoutov wrote: On Wed, Nov 29, 2017 at 06:42:54PM -0800, vit via Git for human beings wrote: I'm looking for ways to improve fetch/pull/clone time for large git (mono)repositories with unrelated source trees (that span across multiple services). I've found

[PATCH v3 3/3] rebase: rebasing can also be done when HEAD is detached

Attempting to rebase when the HEAD is detached and is already up to date with upstream (so there's nothing to do), the following message is shown Current branch HEAD is up to date. which is clearly wrong as HEAD is not a branch. Handle the special case of HEAD correctly to give a more

[PATCH v5 4/4] builtin/branch: strip refs/heads/ using skip_prefix

Instead of hard-coding the offset strlen("refs/heads/") to skip the prefix "refs/heads/" use the skip_prefix() function which is more communicative and verifies that the string actually starts with that prefix. Signed-off-by: Kaartic Sivaraam --- Sorry, missed a ';'

Re: Bare repository fetch/push race condition

Sorry for misleading subject. It should be "Race condition between pushing to and pushing from a bare repository"