[PATCH v3 03/11] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-16 Thread Elijah Newren
Signed-off-by: Elijah Newren --- Documentation/git-fast-export.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index ce954be532..fda55b3284 100644 --- a/Documentation/git-fast-export.txt +++ b

[PATCH v3 02/11] git-fast-import.txt: fix documentation for --quiet option

2018-11-16 Thread Elijah Newren
Signed-off-by: Elijah Newren --- Documentation/git-fast-import.txt | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index e81117d27f..7ab97745a6 100644 --- a/Documentation/git-fast-import.txt +++ b

Re: insteadOf and git-request-pull output

2018-11-15 Thread Junio C Hamano
Konstantin Ryabitsev writes: > On Thu, Nov 15, 2018 at 07:54:32PM +0100, Ævar Arnfjörð Bjarmason wrote: >> > I think that if we use the "principle of least surprise," insteadOf >> > rules shouldn't be applied for git-request-pull URLs. >> >> I hav

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Michael Forney
the possible values for submodule..ignore ("all") don't make sense unless comparing with the working tree. This is also how show/log -p behaved in git <2.15. So I think that clarifying that it is about modifications *to the working tree* would be a good idea. >> I'm also starting to

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Stefan Beller
On Thu, Nov 15, 2018 at 1:33 PM Michael Forney wrote: > > On 2018-11-15, Stefan Beller wrote: > > On Wed, Nov 14, 2018 at 10:05 PM Michael Forney > > wrote: > >> Looking at ff6f1f564c, I don't really see anything that might be > >> related to git-add, git

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Michael Forney
-lib.c| 15 +-- diff.c| 22 ++ 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index f65c17229..9902f7742 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -117,7 +117,6 @@ int add_files_to_cache(const char *

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Michael Forney
On 2018-11-15, Stefan Beller wrote: > On Wed, Nov 14, 2018 at 10:05 PM Michael Forney > wrote: >> Looking at ff6f1f564c, I don't really see anything that might be >> related to git-add, git-reset, or git-diff, so I'm guessing that this >> only worked before because the

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Stefan Beller
gt;> > >> Maybe looking through the series 614ea03a71 > >> (Merge branch 'bw/submodule-config-cleanup', 2017-08-26) > >> to understand why it happened in the context would be a good start. > > > > Thanks, that's a good idea. I'll take a look through tha

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Stefan Beller
> I have a git repository which contains a number of submodules that > refer to external repositories. Some of these repositories need to > patched in some way, so patches are stored alongside the submodules, > and are applied when building. This mostly works fine, but causes > sub

Re: insteadOf and git-request-pull output

2018-11-15 Thread Konstantin Ryabitsev
On Thu, Nov 15, 2018 at 07:54:32PM +0100, Ævar Arnfjörð Bjarmason wrote: > > I think that if we use the "principle of least surprise," insteadOf > > rules shouldn't be applied for git-request-pull URLs. > > I haven't used request-pull so I don't have much of an opinion

Re: insteadOf and git-request-pull output

2018-11-15 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 15 2018, Konstantin Ryabitsev wrote: > Hi, all: > > Looks like setting url.insteadOf rules alters the output of > git-request-pull. I'm not sure that's the intended use of insteadOf, > which is supposed to replace URLs for local use, not to expose them > publicly (

insteadOf and git-request-pull output

2018-11-15 Thread Konstantin Ryabitsev
Hi, all: Looks like setting url.insteadOf rules alters the output of git-request-pull. I'm not sure that's the intended use of insteadOf, which is supposed to replace URLs for local use, not to expose them publicly (but I may be wrong). E.g.: $ git request-pull HEAD^ git://foo.example.com

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-15 Thread Johannes Schindelin
cted is > > > now REBASE-i. > > > > We should be able to make that test pass, still, by writing out a special > > file (e.g. $state_dir/opt_m) and testing for that. Users are oddly upset > > when their expectations are broken... (and I actually agree with th

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-14 Thread Michael Forney
odule-config-cleanup', 2017-08-26) >> to understand why it happened in the context would be a good start. > > Thanks, that's a good idea. I'll take a look through that series. Interesting. If I build git from master after reverting 55568086, I do indeed observe the issue it claims to fix (una

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-14 Thread Michael Forney
ules. I finally got around to bisecting this to commit >> > 5556808690ea245708fb80383be5c1afee2fb3eb (add, reset: ensure >> > submodules can be added or reset). > > Uh. :( > > See the discussion starting at > https://public-inbox.org/git/20170725213928

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-14 Thread Elijah Newren
Hi Phillip, On Mon, Nov 12, 2018 at 10:21 AM Phillip Wood wrote: > >> -Flags only understood by the am backend: > >> +The following options: > >> > >> * --committer-date-is-author-date > >> * --ignore-date > >> @@ -520,15 +512,12 @@ Flags only understood by the am backend: > >> *

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-14 Thread Elijah Newren
ake that test pass, still, by writing out a special > file (e.g. $state_dir/opt_m) and testing for that. Users are oddly upset > when their expectations are broken... (and I actually agree with them.) I agree users are upset when expectations are broken, but why would they expect REBASE-m? In fa

[PATCH v2 4/5] tests: do not require Git to be built when testing an installed Git

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We really only need the test helpers to be built in the worktree in that case, but that is not what we test for. On the other hand it is a perfect opportunity to verify that `GIT_TEST_INSTALLED` points to a working Git. So let's test the appropriate Git executable

[PATCH v2 3/5] t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It makes very, very little sense to test the built git-sh-i18n when the user asked specifically to test another one. Signed-off-by: Johannes Schindelin --- t/lib-gettext.sh | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/t/lib-gettext.sh b/t

[PATCH v2 1/2] rebase: really just passthru the `git am` options

2018-11-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Currently, we parse the options intended for `git am` as if we wanted to handle them in `git rebase`, and then reconstruct them painstakingly to define the `git_am_opt` variable. However, there is a much better way (that I was unaware of, at the time when I mentored

Re: [PATCH 1/1] rebase: really just passthru the `git am` options

2018-11-14 Thread Johannes Schindelin
s to > > > break the error reporting > > > > > > Running > > >bin/wrappers/git rebase --onto @ @^^ -Cbad > > > > > > Gives > > >git encountered an error while preparing the patches to replay > > >these revi

Re: [PATCH 4/5] tests: do not require Git to be built when testing an installed Git

2018-11-14 Thread Johannes Schindelin
Hi Peff, On Wed, 14 Nov 2018, Jeff King wrote: > On Mon, Nov 12, 2018 at 05:48:37AM -0800, Johannes Schindelin via > GitGitGadget wrote: > > > diff --git a/t/test-lib.sh b/t/test-lib.sh > > index 832ede5099..1ea20dc2dc 100644 > > --- a/t/test-lib.sh > > +++ b

Re: [PATCH 4/5] tests: do not require Git to be built when testing an installed Git

2018-11-14 Thread Johannes Schindelin
the test for now when we know that we want to > > test an installed Git. > > True, but... hopefully we are making sure t/helpers/ has been built > in some other ways, though, right? We do it implicitly, in the test cases that use the helpers. However, t/test-lib.sh does not particu

Re: [ANNOUNCE] Git Merge Contributor's Summit Jan 31, 2019, Brussels

2018-11-14 Thread Jeff King
On Wed, Nov 14, 2018 at 12:31:22PM +, Luke Diamand wrote: > On Fri, 9 Nov 2018 at 10:48, Jeff King wrote: > > > > On Fri, Nov 09, 2018 at 10:44:10AM +, Luca Milanesio wrote: > > > > > > On 9 Nov 2018, at 10:42, Jeff King wrote: > > > > > &

Re: [PATCH 4/5] tests: do not require Git to be built when testing an installed Git

2018-11-14 Thread Jeff King
On Mon, Nov 12, 2018 at 05:48:37AM -0800, Johannes Schindelin via GitGitGadget wrote: > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 832ede5099..1ea20dc2dc 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -51,7 +51,7 @@ expo

Re: [ANNOUNCE] Git Merge Contributor's Summit Jan 31, 2019, Brussels

2018-11-14 Thread Luke Diamand
On Fri, 9 Nov 2018 at 10:48, Jeff King wrote: > > On Fri, Nov 09, 2018 at 10:44:10AM +, Luca Milanesio wrote: > > > > On 9 Nov 2018, at 10:42, Jeff King wrote: > > > > > > Git Merge 2019 is happening on February 1st. There will be a > > &

Re: [PATCH] git-compat-util: prefer poll.h to sys/poll.h

2018-11-13 Thread Junio C Hamano
Đoàn Trần Công Danh writes: > -#ifndef NO_SYS_POLL_H > +#if !defined(NO_POLL_H) > +#include > +#elif !defined(NO_SYS_POLL_H) > #include > #else > +/* Pull the compat stuff */ > #include > #endif The last comment would help readers who got "Huh? When NO_POLL_H and NO_SYS_POLL_H is

Re: [PATCH] git-compat-util: prefer poll.h to sys/poll.h

2018-11-13 Thread Danh Doan
"brian m. carlson" writes: >> - t1308.23 is failing because musl `fopen` is success when open directory >> in readonly mode. POSIX allows this behavior: >> http://pubs.opengroup.org/onlinepubs/7908799/xsh/fopen.html >> [EISDIR] >> The named file is a directory and mode requires write access. > >

Re: [PATCH 4/5] tests: do not require Git to be built when testing an installed Git

2018-11-13 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > We really only need the test helpers in that case, but that is not what > we test for. So let's skip the test for now when we know that we want to > test an installed Git. True, but... hop

Re: [PATCH 3/5] t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set

2018-11-13 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > It makes very, very little sense to test the built git-sh-i18n when the > user asked specifically to test another one. > > Signed-off-by: Johannes Schindelin > --- Yup. Makes

Re: [PATCH] git-compat-util: prefer poll.h to sys/poll.h

2018-11-13 Thread Junio C Hamano
"brian m. carlson" writes: > On Wed, Nov 14, 2018 at 08:10:43AM +0700, Đoàn Trần Công Danh wrote: >> POSIX specifies that is the correct header for poll(2) >> whereas is only needed for some old libc. >> >> Let's follow the POSIX way by default. >> >> This effectively eliminates musl's

Re: [PATCH] git-compat-util: prefer poll.h to sys/poll.h

2018-11-13 Thread brian m. carlson
On Wed, Nov 14, 2018 at 08:10:43AM +0700, Đoàn Trần Công Danh wrote: > POSIX specifies that is the correct header for poll(2) > whereas is only needed for some old libc. > > Let's follow the POSIX way by default. > > This effectively eliminates musl's warning: > > warning redirecting

[PATCH] git-compat-util: prefer poll.h to sys/poll.h

2018-11-13 Thread Đoàn Trần Công Danh
ISO-2022-JP, yet. https://wiki.musl-libc.org/functional-differences-from-glibc.html#iconv Makefile | 8 +++- configure.ac | 6 ++ git-compat-util.h | 5 - 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bbfbb4292..5734efe74 100644

[PATCH v2 01/11] git-fast-import.txt: fix documentation for --quiet option

2018-11-13 Thread Elijah Newren
Signed-off-by: Elijah Newren --- Documentation/git-fast-import.txt | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index e81117d27f..7ab97745a6 100644 --- a/Documentation/git-fast-import.txt +++ b

[PATCH v2 02/11] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-13 Thread Elijah Newren
Signed-off-by: Elijah Newren --- Documentation/git-fast-export.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index ce954be532..fda55b3284 100644 --- a/Documentation/git-fast-export.txt +++ b

Re: [PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-13 Thread Elijah Newren
On Tue, Nov 13, 2018 at 3:39 PM Jonathan Nieder wrote: > Elijah Newren wrote: > > Actually, no, it actually needs to be inconsistent. > > > > Different Input Choices (neither backslashed, both backslashed, then just > > one): > > master~9 and master~10 > > master\~9 and master\~10 > >

Re: git-scm.com GUI client links

2018-11-13 Thread Jonathan Nieder
+git@vger.kernel.org, git-secur...@googlegroups.com -> bcc Paul J Sanchez wrote: > On Nov 13, 2018, at 2:25 PM, Stefan Beller wrote: >> The link seems to be https://aurees.com/ ? >> >> They seem to have >> https://aurees.com/legal/license-agreement >> which

Re: [PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-13 Thread Jonathan Nieder
Elijah Newren wrote: > Actually, no, it actually needs to be inconsistent. > > Different Input Choices (neither backslashed, both backslashed, then just > one): > master~9 and master~10 > master\~9 and master\~10 > master\~9 and master~10 > > What the outputs look like: > master9 and

Re: [PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-13 Thread Elijah Newren
On Sat, Nov 10, 2018 at 11:17 PM Elijah Newren wrote: > > On Sat, Nov 10, 2018 at 10:36 PM Jeff King wrote: > > > > On Sat, Nov 10, 2018 at 10:23:04PM -0800, Elijah Newren wrote: > > > > > Signed-off-by: Elijah Newren > > > --- > > > Docu

Re: git-scm.com GUI client links

2018-11-13 Thread Jonathan Nieder
+cc: git@vger.kernel.org, git-secur...@googlegroups.com -> bcc Hi! Paul J Sanchez wrote: > Over the weekend I saw a link to a Mac git client I had not seen > before: Aurees. When I went to the linked site to download a copy, > my antivirus software (Sophos) warned me that it cont

Re: Migration to Git LFS inflates repository multiple times

2018-11-13 Thread Mateusz Loskot
On Mon, 12 Nov 2018 at 00:47, Mateusz Loskot wrote: > > Hi, > > I'm posting here for the first time and I hope it's the right place to ask > questions about Git LFS. > > TL;TR: Is this normal a repository migrated to Git LFS inflates multiple times > and how to deal with

Re: [PATCH 1/1] rebase: really just passthru the `git am` options

2018-11-13 Thread Phillip Wood
Hi Johannes On 13/11/2018 19:21, Johannes Schindelin wrote: Hi Phillip, On Tue, 13 Nov 2018, Phillip Wood wrote: Thanks for looking at this. Unfortunately using OPT_PASSTHRU_ARGV seems to break the error reporting Running bin/wrappers/git rebase --onto @ @^^ -Cbad Gives git

Re: [PATCH 1/1] rebase: really just passthru the `git am` options

2018-11-13 Thread Johannes Schindelin
Hi Phillip, On Tue, 13 Nov 2018, Phillip Wood wrote: > Thanks for looking at this. Unfortunately using OPT_PASSTHRU_ARGV seems to > break the error reporting > > Running > bin/wrappers/git rebase --onto @ @^^ -Cbad > > Gives > git encountered an error whi

Git Test Coverage Report (Tuesday, Nov 13)

2018-11-13 Thread Derrick Stolee
Here is the test coverage report for today. Thanks, -Stolee [1] https://dev.azure.com/git/git/_build/results?buildId=256=logs --- pu: a849d4c48bb308cdf3f9d7dc84251d92b4d7ff03 jch: e3cb78b4131db2f98330ff110525db31c6abff16 next: 17fedb746fde9e40924a6ce11c0976a097eb126b master

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-13 Thread Elijah Newren
quite a bit of > work to do, but you already did most of it. > > Out of curiosity, do you have a public repository with these patches in a > branch? (I might have an hour to play with it tonight...) https://github.com/newren/git/tree/rebase-new-default, but ignore the last two commits;

Re: [PATCH 1/1] rebase: really just passthru the `git am` options

2018-11-13 Thread Phillip Wood
Hi Johannes Thanks for looking at this. Unfortunately using OPT_PASSTHRU_ARGV seems to break the error reporting Running bin/wrappers/git rebase --onto @ @^^ -Cbad Gives git encountered an error while preparing the patches to replay these revisions

Re: [PATCH 1/1] rebase: really just passthru the `git am` options

2018-11-13 Thread Junio C Hamano
"" }, > - OPT_STRING_LIST(0, "whitespace", , > - N_("whitespace"), N_("passed to 'git apply'")), > - OPT_SET_INT('C', NULL, _c, N_("passed to 'git apply'"), > -

[PATCH 1/1] rebase: really just passthru the `git am` options

2018-11-13 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Currently, we parse the options intended for `git am` as if we wanted to handle them in `git rebase`, and then reconstruct them painstakingly to define the `git_am_opt` variable. However, there is a much better way (that I was unaware of, at the time when I mentored

Re: [PATCH 4/5] built-in rebase --skip/--abort: clean up stale .git/ files

2018-11-13 Thread Johannes Schindelin
Hi Junio, On Tue, 13 Nov 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > From: Johannes Schindelin > > > > The scripted version of the rebase used to execute `git reset --hard` > > when skipping or aborti

Re: [PATCH v3] remote: add --save-to-push option to git remote set-url

2018-11-13 Thread Junio C Hamano
Denton Liu writes: > This adds the --save-to-push option to `git remote set-url` such that > when executed, we move the remote.*.url to remote.*.pushurl and set > remote.*.url to the given url argument. > > For example, if we have the following config: > >

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-13 Thread Johannes Schindelin
gt; >> special strategy options. As such, there really is not any need for > >> having both git-rebase--merge and git-rebase--interactive anymore. > >> > >> Delete git-rebase--merge.sh and have the --merge option be implemented > >> by the now built-in inte

Re: [PATCH 4/5] built-in rebase --skip/--abort: clean up stale .git/ files

2018-11-12 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > The scripted version of the rebase used to execute `git reset --hard` > when skipping or aborting. When we ported this to C, we did update the > worktree and some reflogs, but we failed to

Re: Migration to Git LFS inflates repository multiple times

2018-11-12 Thread Mateusz Loskot
On Mon, 12 Nov 2018 at 13:31, Jeff King wrote: > On Mon, Nov 12, 2018 at 12:47:42AM +0100, Mateusz Loskot wrote: > > > > TL;TR: Is this normal a repository migrated to Git LFS inflates multiple > > times > > and how to deal with it? > > That does sound odd to me

[PATCH 4/5] built-in rebase --skip/--abort: clean up stale .git/ files

2018-11-12 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The scripted version of the rebase used to execute `git reset --hard` when skipping or aborting. When we ported this to C, we did update the worktree and some reflogs, but we failed to imitate `git reset --hard`'s behavior regarding files in .git/ such as MERGE_HEAD

[PATCH 0/1] Allow "no-op hunks" when editing the diff in git add -e

2018-11-12 Thread Johannes Schindelin via GitGitGadget
I use git add -e frequently. Often there are multiple hunks and I end up deleting the + lines and converting the - lines to context lines, as I like to stage massive changes in an incremental fashion (and commit those staged changes incrementally, too). Some time after I invented git add -e

Re: Git Reference Manual enhance

2018-11-12 Thread Jonathan Nieder
Hi Fredi, Fredi Fowler wrote: > Is there any way to create pull request to git man (https://git-scm.com/docs)? > > I found there some inconsistencies. For example, almost in all pages > are using [no-], but at https://git-scm.com/docs/git-merge each > command (with [no-] or

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-12 Thread Phillip Wood
rms of cherry-pick rather than >> the merge-recursive builtin, but cherry-pick also calls into the recursive >> merge machinery by default and can accept special merge strategies and/or >> special strategy options. As such, there really is not any need for >> having both git

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-12 Thread Johannes Schindelin
> special strategy options. As such, there really is not any need for > having both git-rebase--merge and git-rebase--interactive anymore. > > Delete git-rebase--merge.sh and have the --merge option be implemented > by the now built-in interactive machinery. Okay. > Note that this ch

Re: Import/Export as a fast way to purge files from Git?

2018-11-12 Thread Elijah Newren
; On Sun, Sep 23, 2018 at 6:08 AM Lars Schneider > >> > wrote: > >> >> > >> >> Hi, > >> >> > >> >> I recently had to purge files from large Git repos (many files, many > >> >> commits). > >> >> Th

Re: [PATCH v2 1/2] git-rebase, sequencer: extend --quiet option for the interactive machinery

2018-11-12 Thread Johannes Schindelin
up an editor. The rewrite of interactive rebase in C > added a quiet option, though it only turns stats off. Since we want to > make the interactive machinery also take over for git-rebase--merge, it > should fully implement the --quiet option. > > git-rebase--interactive was already

[PATCH 4/5] tests: do not require Git to be built when testing an installed Git

2018-11-12 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We really only need the test helpers in that case, but that is not what we test for. So let's skip the test for now when we know that we want to test an installed Git. Signed-off-by: Johannes Schindelin --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH 3/5] t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set

2018-11-12 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It makes very, very little sense to test the built git-sh-i18n when the user asked specifically to test another one. Signed-off-by: Johannes Schindelin --- t/lib-gettext.sh | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/t/lib-gettext.sh b/t

Re: [RFC/PATCH 0/5] stop installing old libexec aliases like "git-init"

2018-11-12 Thread Johannes Schindelin
Hi Ævar, On Fri, 2 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > * GIT_TEST_INSTALLED breaks entirely under this, as early as the >heuristic for "are we built?" being "do we have git-init in >libexecdir?". I tried a bit to make this work, but there's a lot o

Re: Add issue management within git

2018-11-12 Thread Martin Delille
Hi, Thank you very much! The git-bug project is what I'm looking for even if it is not very interesting without gitlab connection. There is an issue about it on Gitlab: https://gitlab.com/gitlab-org/gitlab-ce/issues/50435 Maybe some encouragment from git core developer would help! I also

Re: Migration to Git LFS inflates repository multiple times

2018-11-12 Thread Ævar Arnfjörð Bjarmason
On Mon, Nov 12 2018, Jeff King wrote: > On Mon, Nov 12, 2018 at 12:47:42AM +0100, Mateusz Loskot wrote: > >> Hi, >> >> I'm posting here for the first time and I hope it's the right place to ask >> questions about Git LFS. >> >> TL;TR: Is this normal

Re: Migration to Git LFS inflates repository multiple times

2018-11-12 Thread Jeff King
On Mon, Nov 12, 2018 at 12:47:42AM +0100, Mateusz Loskot wrote: > Hi, > > I'm posting here for the first time and I hope it's the right place to ask > questions about Git LFS. > > TL;TR: Is this normal a repository migrated to Git LFS inflates multiple times

Re: Add issue management within git

2018-11-12 Thread Konstantin Khomoutov
On Sun, Nov 11, 2018 at 11:50:00PM +0100, Martin Delille wrote: > This would be awesome to handle issue directly with git: Having an > offline version of the issues synced to the gitlab/github issues. A > lot of work is done on the issues and it is lost when migrating from >

Re: Add issue management within git

2018-11-12 Thread Ævar Arnfjörð Bjarmason
On Mon, Nov 12 2018, Konstantin Khomoutov wrote: > On Mon, Nov 12, 2018 at 09:35:31AM +0800, yan ke wrote: > >> > This would be awesome to handle issue directly with git: >> > Having an offline version of the issues synced to the gitlab/github issues. >> > A

Re: Import/Export as a fast way to purge files from Git?

2018-11-12 Thread Ævar Arnfjörð Bjarmason
Hi, >> >> >> >> I recently had to purge files from large Git repos (many files, many >> >> commits). >> >> The usual recommendation is to use `git filter-branch --index-filter` to >> >> purge >> >> files. However, this is *ver

Re: Add issue management within git

2018-11-12 Thread Konstantin Khomoutov
On Mon, Nov 12, 2018 at 09:35:31AM +0800, yan ke wrote: > > This would be awesome to handle issue directly with git: > > Having an offline version of the issues synced to the gitlab/github issues. > > A lot of work is done on the issues and it is lost when migrating &g

Re: Add issue management within git

2018-11-11 Thread yan ke
the git issue track! Martin Delille 于2018年11月12日周一 上午6:52写道: > > Hi, > > This would be awesome to handle issue directly with git: > Having an offline version of the issues synced to the gitlab/github issues. > A lot of work is done on the issues and it is lost when migrating f

Migration to Git LFS inflates repository multiple times

2018-11-11 Thread Mateusz Loskot
Hi, I'm posting here for the first time and I hope it's the right place to ask questions about Git LFS. TL;TR: Is this normal a repository migrated to Git LFS inflates multiple times and how to deal with it? I'm migrating a big SVN repository to Git. In SVN, a collection of third-party SDKs

Add issue management within git

2018-11-11 Thread Martin Delille
Hi, This would be awesome to handle issue directly with git: Having an offline version of the issues synced to the gitlab/github issues. A lot of work is done on the issues and it is lost when migrating from one service to the other. Beside we don’t always have a good internet connection

Re: BUG REPORT: git clone of non-existent repository results in request for credentials

2018-11-11 Thread Federico Lucifredi
I was afraid that was the reason. Oh well, at least we know why :-) Thanks Ævar! Best-F > On Nov 11, 2018, at 9:00 AM, Ævar Arnfjörð Bjarmason wrote: > > >> On Sun, Nov 11 2018, Federico Lucifredi wrote: >> >> git clone of non-existent repository results

Re: BUG REPORT: git clone of non-existent repository results in request for credentials

2018-11-11 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 11 2018, Federico Lucifredi wrote: > git clone of non-existent repository results in request for credentials > > REPRODUCING: > sudo apt install git > git clone https://github.com/xorbit/LiFePo4owered-Pi.git#this repo does > not exist > > Git will

BUG REPORT: git clone of non-existent repository results in request for credentials

2018-11-11 Thread Federico Lucifredi
git clone of non-existent repository results in request for credentials REPRODUCING: sudo apt install git git clone https://github.com/xorbit/LiFePo4owered-Pi.git#this repo does not exist Git will then prompt for username and password on Github. I can see a valid data-leak concern (one

Re: [PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-10 Thread Elijah Newren
On Sat, Nov 10, 2018 at 10:36 PM Jeff King wrote: > > On Sat, Nov 10, 2018 at 10:23:04PM -0800, Elijah Newren wrote: > > > Signed-off-by: Elijah Newren > > --- > > Documentation/git-fast-export.txt | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) &

Re: [PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:04PM -0800, Elijah Newren wrote: > Signed-off-by: Elijah Newren > --- > Documentation/git-fast-export.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-fast-export.txt > b/Documentation/git-fa

Re: [PATCH 01/10] git-fast-import.txt: fix documentation for --quiet option

2018-11-10 Thread Jeff King
On Sat, Nov 10, 2018 at 10:23:03PM -0800, Elijah Newren wrote: > Signed-off-by: Elijah Newren > --- > Documentation/git-fast-import.txt | 7 --- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-fast-import.txt > b/Documentatio

[PATCH 02/10] git-fast-export.txt: clarify misleading documentation about rev-list args

2018-11-10 Thread Elijah Newren
Signed-off-by: Elijah Newren --- Documentation/git-fast-export.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index ce954be532..677510b7f7 100644 --- a/Documentation/git-fast-export.txt +++ b

[PATCH 01/10] git-fast-import.txt: fix documentation for --quiet option

2018-11-10 Thread Elijah Newren
Signed-off-by: Elijah Newren --- Documentation/git-fast-import.txt | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index e81117d27f..7ab97745a6 100644 --- a/Documentation/git-fast-import.txt +++ b

Re: Git Reference Manual enhance

2018-11-10 Thread Eric Sunshine
On Sat, Nov 10, 2018 at 7:21 PM Fredi Fowler wrote: > Is there any way to create pull request to git man (https://git-scm.com/docs)? That website is maintained as a project separate from Git, so you can report issues specific to the website, or create pull requests, at its project page (ht

Git Reference Manual enhance

2018-11-10 Thread Fredi Fowler
Is there any way to create pull request to git man (https://git-scm.com/docs)? I found there some inconsistencies. For example, almost in all pages are using [no-], but at https://git-scm.com/docs/git-merge each command (with [no-] or without) write separately. There are some same

Re: [PATCH] p3400: replace calls to `git checkout -b' by `git checkout -B'

2018-11-10 Thread Johannes Schindelin
Hi Alban, On Fri, 9 Nov 2018, Alban Gruin wrote: > p3400 makes a copy of the current repository to test git-rebase > performance, and creates new branches in the copy with `git checkout > -b'. If the original repository has branches with the same name as the > script is tryi

[PATCH] p3400: replace calls to `git checkout -b' by `git checkout -B'

2018-11-09 Thread Alban Gruin
p3400 makes a copy of the current repository to test git-rebase performance, and creates new branches in the copy with `git checkout -b'. If the original repository has branches with the same name as the script is trying to create, this operation will fail. This replaces these calls by `git

Re: Git Evolve

2018-11-09 Thread Johannes Schindelin
Hi, On Tue, 2 Oct 2018, Ævar Arnfjörð Bjarmason wrote: > On Tue, Oct 02 2018, Taylor Blau wrote: > > > Hi Stefan, > > > > On Sat, Sep 29, 2018 at 04:00:04PM -0700, Stefan Xenos wrote: > >> Hello, List! > >> > >> I'm interested in porting so

Re: [ANNOUNCE] Git Merge Contributor's Summit Jan 31, 2019, Brussels

2018-11-09 Thread Jeff King
On Fri, Nov 09, 2018 at 10:44:10AM +, Luca Milanesio wrote: > > On 9 Nov 2018, at 10:42, Jeff King wrote: > > > > Git Merge 2019 is happening on February 1st. There will be a > > Contributor's Summit the day before. Here are the details: > > > > When:

Re: [ANNOUNCE] Git Merge Contributor's Summit Jan 31, 2019, Brussels

2018-11-09 Thread Luca Milanesio
> On 9 Nov 2018, at 10:42, Jeff King wrote: > > Git Merge 2019 is happening on February 1st. There will be a > Contributor's Summit the day before. Here are the details: > > When: Thursday, January 31, 2019. 10am-5pm. > Where: The Egg[1], Brussels, Belgium > What

[ANNOUNCE] Git Merge Contributor's Summit Jan 31, 2019, Brussels

2018-11-09 Thread Jeff King
Git Merge 2019 is happening on February 1st. There will be a Contributor's Summit the day before. Here are the details: When: Thursday, January 31, 2019. 10am-5pm. Where: The Egg[1], Brussels, Belgium What: Round-table discussion about Git Who: All contributors to Git or related projects

[PATCH v3] remote: add --save-to-push option to git remote set-url

2018-11-08 Thread Denton Liu
This adds the --save-to-push option to `git remote set-url` such that when executed, we move the remote.*.url to remote.*.pushurl and set remote.*.url to the given url argument. For example, if we have the following config: [remote "origin"] url = g...@gith

Re: [RFC PATCH v2] remote: add --save-push option to git remote set-url

2018-11-08 Thread Junio C Hamano
Denton Liu writes: > This adds the --save-push option to `git remote set-url` such that when > executed, we move the remote.*.url to remote.*.pushurl and set > remote.*.url to the given url argument. > > For example, if we have the following config: > >

[RFC PATCH v2] remote: add --save-push option to git remote set-url

2018-11-08 Thread Denton Liu
This adds the --save-push option to `git remote set-url` such that when executed, we move the remote.*.url to remote.*.pushurl and set remote.*.url to the given url argument. For example, if we have the following config: [remote "origin"] url = g...@github.com:g

Re: git-rebase is ignoring working-tree-encoding

2018-11-08 Thread Torsten Bögershausen
bed in the PR), and the problem is not directly related to > rebasing, so I considered it better in order to avoid unrelated > confusions. > > Let's get back to the problem. Each system has a default endianness. > Also, in .gitattributes's working-tree-encoding, Git behaves &g

[PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-07 Thread Elijah Newren
both git-rebase--merge and git-rebase--interactive anymore. Delete git-rebase--merge.sh and have the --merge option be implemented by the now built-in interactive machinery. Note that this change fixes a few known test failures (see t3421). testcase modification notes: t3406: --interactive

[PATCH v2 1/2] git-rebase, sequencer: extend --quiet option for the interactive machinery

2018-11-07 Thread Elijah Newren
it only turns stats off. Since we want to make the interactive machinery also take over for git-rebase--merge, it should fully implement the --quiet option. git-rebase--interactive was already somewhat quieter than git-rebase--merge and git-rebase--am, possibly because cherry-pick has just

Git Test Coverage Report (Wednesday, Nov 7)

2018-11-07 Thread Derrick Stolee
Here is the coverage report for today. Thanks, -Stolee [1] https://dev.azure.com/git/git/_build/results?buildId=251=logs --- pu: 381b31f0006e46fe041e7fc6e5f7b19da5ccd889 jch: ab76604d6537afa18c9d8588c08f699c1f539659 next: 8438c0b2453a7207c9c45756f5e37dfe283db602 master

Re: git-rebase is ignoring working-tree-encoding

2018-11-06 Thread Adrián Gimeno Balaguer
r to avoid unrelated confusions. Let's get back to the problem. Each system has a default endianness. Also, in .gitattributes's working-tree-encoding, Git behaves differently depending on the attribute's value and the contents of the referenced entry file. When I put the value "UTF-16", the

Re: git-rebase is ignoring working-tree-encoding

2018-11-06 Thread Torsten Bögershausen
On Mon, Nov 05, 2018 at 07:10:14PM +0100, Torsten Bögershausen wrote: > On Mon, Nov 05, 2018 at 05:24:39AM +0100, Adrián Gimeno Balaguer wrote: > > [] > > > https://github.com/git/git/pull/550 > > [] > > > This is covered in the mentioned PR above.

Bug: git-svn clone --preserve-empty-dirs fail - couldn't truncate file at /usr/share/perl5/Git.pm line 1337.

2018-11-06 Thread Georg Tsakumagos
rom this bug. Used Version:   1:2.17.1-1ubuntu0.3 OS:                       Ubuntu 16.04.5 LTS Commandline: /usr/bin/git svn clone --prefix= --preserve-empty-dirs --authors-file=/mnt/migration/authors.txt --stdlayout https://host/repo /mnt/migration/repos/TES

Re: Git Slowness on Windows w/o Internet

2018-11-05 Thread Peter Kostyukov
i, Nov 02, 2018 at 11:10:51AM -0500, Peter Kostyukov wrote: > >> Wanted to bring to your attention an issue that we discovered on our > >> Windows Jenkins nodes with git scm installed (git.exe). Our Jenkins > >> servers don't have Internet access. It appears that gi

<    1   2   3   4   5   6   7   8   9   10   >