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

Ævar Arnfjörð Bjarmason, Wed, Dec 20, 2017 19:24:19 +0100: > diff --git a/INSTALL b/INSTALL > index ffb071e9f0..808e07b659 100644 > --- a/INSTALL > +++ b/INSTALL > @@ -84,9 +84,24 @@ Issues of note: > > GIT_EXEC_PATH=`pwd` > PATH=`pwd`:$PATH > - GITPERLLIB=`pwd`/perl/blib/lib > +

Re: Usability outrage as far as I am concerned

On Wed, Dec 20, 2017 at 8:40 AM, Cristian Achim wrote: > All I will do is paste the stackoverflow question below. It covers the > commands I made in chronological order and the way I would have > expected git to behave differently. > > So I did > > git pull home_subfolder

Re: [PATCH 4/6] fsmonitor: Add a trailing newline to test-dump-fsmonitor

On Tue, 19 Dec 2017, Junio C Hamano wrote: > That (and existing) uses of printf() all feel a bit overkill ;-) > Perhaps putchar() would suffice. > > I am not sure if the above wants to become something like > > for (i = 0; i < istate->cache_nr; i++) { >

[PATCH] t/helper/test-lazy-name-hash: fix compilation

I was compiling origin/master today with the DEVELOPER compiler flags today and was greeted by t/helper/test-lazy-init-name-hash.c: In function ‘cmd_main’: t/helper/test-lazy-init-name-hash.c:172:5: error: ‘nr_threads_used’ may be used uninitialized in this function [-Werror=maybe-uninitialized]

Re: Usability outrage as far as I am concerned

On Wed, Dec 20, 2017 at 5:40 PM, Cristian Achim wrote: > All I will do is paste the stackoverflow question below. It covers the > commands I made in chronological order and the way I would have > expected git to behave differently. > > So I did > > git pull home_subfolder

[PATCHv2 0/4] Fix --recurse-submodules for submodule worktree changes

v2: * squashed the test patch and the bugfix, rewriting the commit message entirely. This might not the way Jonathan imagined how I address the potential user confusion[1], but I think it does the job. [1] https://public-inbox.org/git/2017122148.gj240...@aiede.mtv.corp.google.com/ v1:

[PATCH 1/4] t/lib-submodule-update.sh: clarify test

Keep the local branch name as the upstream branch name to avoid confusion. Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index

[PATCH 2/4] t/lib-submodule-update.sh: Fix test ignoring ignored files in submodules

It turns out that this buggy test passed due to the buggy implementation, which will soon be corrected. Let's fix the test first. Signed-off-by: Stefan Beller --- t/lib-submodule-update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/lib-submodule-update.sh

[PATCH 4/4] submodule: submodule_move_head omits old argument in forced case

When using hard reset or forced checkout with the option to recurse into submodules, the submodules need to be reset, too. It turns out that we need to omit the duplicate old argument to read-tree in all forced cases to omit the 2 way merge and use the more assertive behavior of reading the

[PATCH 3/4] unpack-trees: Fix same() for submodules

The function same(a, b) is used to check if two entries a and b are the same. As the index contains the staged files the same() function can be used to check if files between a given revision and the index are the same. In case of submodules, the gitlink entry is showing up as not modified

Re: [PATCH 2/2] commit: add support for --fixup -m""

On Wed, Dec 20, 2017 at 4:40 PM, Ævar Arnfjörð Bjarmason wrote: > On Wed, Dec 20 2017, Eric Sunshine jotted: >> On Wed, Dec 20, 2017 at 2:38 PM, Ævar Arnfjörð Bjarmason >> wrote: >>> +test_expect_success 'commit --fixup -m"something" -m"extra"' ' >>> +

Re: [PATCH 2/2] commit: add support for --fixup -m""

On Wed, Dec 20 2017, Eric Sunshine jotted: > On Wed, Dec 20, 2017 at 2:38 PM, Ævar Arnfjörð Bjarmason > wrote: >> Add support for supplying the -m option with --fixup. Doing so has >> errored out ever since --fixup was introduced. Before this, the only >> way to amend the

Re: [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later

On Mon, 18 Dec 2017, Alex Vandiver wrote: > dd9005a0a ("fsmonitor: delay updating state until after split index is > merged", 2017-10-27) began deferring the setting of the > CE_FSMONITOR_VALID flag until later, such that do_read_index() does > not perform those steps. This means that

Re: [PATCH 2/6] fsmonitor: Add dir.h include, for untracked_cache_invalidate_path

On Tue, 19 Dec 2017, Junio C Hamano wrote: > Alex Vandiver writes: > > > Subject: Re: [PATCH 2/6] fsmonitor: Add dir.h include, for > > untracked_cache_invalidate_path > > Perhaps > > "Subject: fsmonitor.h: include dir.h" Certainly more concise. > But I am not sure if

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

Ævar Arnfjörð Bjarmason wrote: > On Wed, Dec 20, 2017 at 6:41 PM, Todd Zullinger wrote: >> /usr/share/perl5/vendor_perl/Git >> /usr/share/perl5/vendor_perl/Git.pm >> /usr/share/perl5/vendor_perl/Git/Error.pm >> [...] >> /usr/share/perl5/vendor_perl/build >>

Re: [PATCH 2/2] commit: add support for --fixup -m""

On Wed, Dec 20, 2017 at 2:38 PM, Ævar Arnfjörð Bjarmason wrote: > Add support for supplying the -m option with --fixup. Doing so has > errored out ever since --fixup was introduced. Before this, the only > way to amend the fixup message while committing was to use --edit and >

Re: [PATCH 1/2] commit doc: document that -c, -C, -F and --fixup with -m error

On Wed, Dec 20, 2017 at 2:38 PM, Ævar Arnfjörð Bjarmason wrote: > Document that providing any of -c, -C, -F and --fixup along with -m > will result in an error. Some variant of this has been errored about > explicitly since 0c091296c0 ("git-commit: log parameter updates.", >

Re: [PATCH 1/4] status: add --no-ahead-behind to porcelain V2

On 12/20/2017 11:33 AM, Jeff King wrote: On Wed, Dec 20, 2017 at 02:42:42PM +, Jeff Hostetler wrote: diff --git a/Documentation/config.txt b/Documentation/config.txt index 9593bfa..9ccdf2b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -3082,6 +3082,11 @@

[PATCH 2/2] commit: add support for --fixup -m""

Add support for supplying the -m option with --fixup. Doing so has errored out ever since --fixup was introduced. Before this, the only way to amend the fixup message while committing was to use --edit and amend it in the editor. The use-case for this feature is one of: * Leaving a quick note

[PATCH 1/2] commit doc: document that -c, -C, -F and --fixup with -m error

Document that providing any of -c, -C, -F and --fixup along with -m will result in an error. Some variant of this has been errored about explicitly since 0c091296c0 ("git-commit: log parameter updates.", 2005-08-08), but the documentation was never updated to reflect this. Signed-off-by: Ævar

Re: [PATCH 5/5] submodule: submodule_move_head omits old argument in forced case

On Wed, Dec 20, 2017 at 11:36 AM, Stefan Beller wrote: > On Tue, Dec 19, 2017 at 4:01 PM, Jonathan Nieder wrote: >> Stefan Beller wrote: >>> On Tue, Dec 19, 2017 at 2:44 PM, Jonathan Nieder wrote: >> checkout -f I

Re: [PATCH 5/5] submodule: submodule_move_head omits old argument in forced case

On Tue, Dec 19, 2017 at 4:01 PM, Jonathan Nieder wrote: > Stefan Beller wrote: >> On Tue, Dec 19, 2017 at 2:44 PM, Jonathan Nieder wrote: > >>> checkout -f >>> I think I would expect this not to touch a submodule that >>> hasn't changed,

Error in `git': free(): invalid pointer (was Re: [PATCH] sequencer: improve config handling)

I recently encountered that error when trying to do an interactive rebase after using filter-branch to remove a file completely in a repository. I bisected this issue which pointed at this patch. I'm not sure how it is related as I'm not too familiar with the sequencer code. I could help in case

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

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]. The reason for having the Makefile.PL in the first place is that it was initially[2]

Re: What's cooking in git.git (Dec 2017, #04; Tue, 19)

On Wednesday 20 December 2017 03:30 AM, Junio C Hamano wrote: * pw/sequencer-in-process-commit (2017-12-13) 10 commits (merged to 'next' on 2017-12-13 at ec4d2b9c84) ... The sequencer infrastructure is shared across "git cherry-pick", "git rebase -i", etc., and has always spawned "git

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

On Wed, Dec 20, 2017 at 12:22 AM, Andreas Urke wrote: > Thanks for looking into this. > > I was able to reproduce it from scratch, but I followed my earlier > workflow where I first created the subrepos, and then later renamed > it. At the time I was not able to find any command

[ANNOUNCE] Git Rev News edition 34

Hi everyone, The 34th edition of Git Rev News is now published: https://git.github.io/rev_news/2017/12/20/edition-34/ Thanks a lot to all the contributors and helpers! Enjoy, Christian, Jakub and Markus.

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

Ævar Arnfjörð Bjarmason wrote: > [Sorry for not CC-ing you on the last version. Forgot to update the > giant send-email line I'm juggling for this series]. No worries. It is a rather large CC list at this point. :) > This *.pmc thing is just me being overly clever. Here's a v5 that gets > rid

Re: [PATCH 5/6] fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh

Hi Junio, On Tue, 19 Dec 2017, Junio C Hamano wrote: > Alex Vandiver writes: > > > These were mistakenly left in when the test was introduced, in > > 1487372d3 ("fsmonitor: store fsmonitor bitmap before splitting index", > > 2017-11-09) > > > > Signed-off-by: Alex Vandiver

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

On Wed, Dec 20, 2017 at 02:42:41PM +, Jeff Hostetler wrote: > From: Jeff Hostetler > > This patch series adds a "--no-ahead-behind" option to status > to request that it avoid a possibly expensive ahead/behind > computation for the current branch. Instead, it just

Usability outrage as far as I am concerned

All I will do is paste the stackoverflow question below. It covers the commands I made in chronological order and the way I would have expected git to behave differently. So I did git pull home_subfolder while in usb_subfolder. Can't remember the immediate output, but it included a part about

Re: [PATCH 2/4] stat_tracking_info: return +1 when branch and upstream differ

On Wed, Dec 20, 2017 at 11:14:07AM -0500, Jeff King wrote: > On Wed, Dec 20, 2017 at 02:42:43PM +, Jeff Hostetler wrote: > > > Extend stat_tracking_info() to return 1 when the branch is > > not up to date with its upstream branch and only return 0 > > when they are equal. > > This means

Re: [PATCH 1/4] status: add --no-ahead-behind to porcelain V2

On Wed, Dec 20, 2017 at 02:42:42PM +, Jeff Hostetler wrote: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 9593bfa..9ccdf2b 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -3082,6 +3082,11 @@ status.submoduleSummary:: > submodule

Re: [PATCH 4/4] status: support --no-ahead-behind in long status format.

On Wed, Dec 20, 2017 at 02:42:45PM +, Jeff Hostetler wrote: > diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt > index ea029ad..9a2f209 100644 > --- a/Documentation/git-status.txt > +++ b/Documentation/git-status.txt > @@ -120,6 +120,9 @@ configuration variable

Re: [PATCH 3/4] status: update short status to use --no-ahead-behind

On Wed, Dec 20, 2017 at 02:42:44PM +, Jeff Hostetler wrote: > From: Jeff Hostetler > > Teach "git status --short --branch" to use "--no-ahead-behind" > flag to skip computing ahead/behind counts for the branch and > its upstream and just report '[different]'. How

Re: [PATCH 2/4] stat_tracking_info: return +1 when branch and upstream differ

On Wed, Dec 20, 2017 at 02:42:43PM +, Jeff Hostetler wrote: > Extend stat_tracking_info() to return 1 when the branch is > not up to date with its upstream branch and only return 0 > when they are equal. This means that callers all need to be updated, but there's no change that the compiler

Re: [PATCH 1/4] status: add --no-ahead-behind to porcelain V2

On Wed, Dec 20, 2017 at 02:42:42PM +, Jeff Hostetler wrote: > diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt > index 9f3a78a..6ce8cf8 100644 > --- a/Documentation/git-status.txt > +++ b/Documentation/git-status.txt > @@ -111,6 +111,13 @@ configuration variable

[PATCH 4/4] status: support --no-ahead-behind in long status format.

From: Jeff Hostetler Teach long (normal) status format to respect the --no-ahead-behind argument and skip the possibly expensive ahead/behind computation when printing the branch tracking information. When --no-ahead-behind is given or status.noaheadbehind is true,

[PATCH 3/4] status: update short status to use --no-ahead-behind

From: Jeff Hostetler Teach "git status --short --branch" to use "--no-ahead-behind" flag to skip computing ahead/behind counts for the branch and its upstream and just report '[different]'. Signed-off-by: Jeff Hostetler ---

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

From: Jeff Hostetler This patch series adds a "--no-ahead-behind" option to status to request that it avoid a possibly expensive ahead/behind computation for the current branch. Instead, it just prints a not up to date message in place of the detailed counts. This idea

[PATCH 2/4] stat_tracking_info: return +1 when branch and upstream differ

From: Jeff Hostetler Extend stat_tracking_info() to return 1 when the branch is not up to date with its upstream branch and only return 0 when they are equal. Signed-off-by: Jeff Hostetler --- ref-filter.c | 4 ++-- remote.c | 6 --

[PATCH 1/4] status: add --no-ahead-behind to porcelain V2

From: Jeff Hostetler Teach "status --porcelain=v2 --branch" to omit "# branch.ab x y" when "--no-ahead-behind" argument is used. This allows the user to omit the (possibly extremely expensive) ahead/behind computation when not needed. Signed-off-by: Jeff Hostetler

Re: [PATCH] doc: Fix specification of default (auto) for --color

On Wed, Dec 20, 2017 at 05:14:02AM -0800, William Pursell wrote: > Current documentation for branch, show-branch, and grep contain the following: > > --color[=] >Show colored matches. The value must be always (the > default), never, or auto. > > This is incorrect, as the default is

[PATCH] doc: Fix specification of default (auto) for --color

Current documentation for branch, show-branch, and grep contain the following: --color[=] Show colored matches. The value must be always (the default), never, or auto. This is incorrect, as the default is "auto". Signed-off-by: William Pursell ---

Re: [PATCH] revision: introduce prepare_revision_walk_extended()

On Tue, Dec 19, 2017 at 10:33:55AM -0800, Junio C Hamano wrote: > >> Why does prepare_revision_walk() clear the list of pending objects at > >> all? Assuming the list is append-only then perhaps remembering the > >> last handled index would suffice. > > For that matter, why does it copy,

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

On Tue, Dec 19, 2017 at 07:26:06PM +0100, René Scharfe wrote: > > That's the same duality we have now with string_list. > > Hmm, I thought we *were* discussing string_list? Right, I guess what I was wondering is if a wrapper over string_list really ends up any better than having the

Re: Need help migrating workflow from svn to git.

On Wed, Dec 20, 2017 at 12:43:37PM +0100, Josef Wolf wrote: > Thanks to you both for your patience with me. Sorry for the late reply, my day > job was needing me ;-) > > On Fri, Dec 15, 2017 at 07:58:14PM +0100, Igor Djordjevic wrote: > > On 15/12/2017 17:33, Junio C Hamano wrote: > > > > > >

Re: Need help migrating workflow from svn to git.

On Fri, Dec 15, 2017 at 11:09:17AM -0800, Junio C Hamano wrote: > Igor Djordjevic writes: > > > Junio, what about consecutive runs, while merge conflicts are still > > unresolved? > > The impression I got was that the original running with svn does not > deal with

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

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]. The reason for having the Makefile.PL in the first place is that it was initially[2]

Re: Need help migrating workflow from svn to git.

Thanks to you both for your patience with me. Sorry for the late reply, my day job was needing me ;-) On Fri, Dec 15, 2017 at 07:58:14PM +0100, Igor Djordjevic wrote: > On 15/12/2017 17:33, Junio C Hamano wrote: > > > > $ git fetch > > $ git checkout -m -B FETCH_HEAD For some reason,

git merge commits staged files (when two trees are identical)

Hi everybody, we just stumbled over a situation in which a merge commits staged changes into the merge commit. This happens when the merged-in branch does have commits ('main') but has the same tree ('--allow-empty') as the merge base: git init echo eins >a git add a git commit

Re: [PATCH] http: support CURLPROXY_HTTPS

On Wed, Dec 20, 2017 at 10:22:06AM +0800, Wei Shuyu wrote: > On 2017-12-20 04:59, Jonathan Nieder wrote: > > > Thanks for writing this. Can you give an example of how I'd use it > > (ideally in the form of a test in t/ so we avoid this functionality > > regressing, but if that's not

Re: [PATCH] path: document path functions

On Wed, Dec 13, 2017 at 1:28 PM, Brandon Williams wrote: > As promised here is an update to the documentation for the path generating > functions. Thanks for working on this. Aside from the review comments by Junio[1], see a few more below. Although I had some familiarity with

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

Thanks for looking into this. I was able to reproduce it from scratch, but I followed my earlier workflow where I first created the subrepos, and then later renamed it. At the time I was not able to find any command to rename without changing the path (and I was not able find one now either, is