Am Mi., 6. März 2019 um 06:14 Uhr schrieb Johannes Schindelin
:
>
> Hi Stefan,
>
> just wanted to express my gratitude for your idea to introduce the `break`
> command in `git rebase -i`'s todo list. I use it *all* the time now.
You're welcome. As you know I am currently taking a break form #git,
> Have fun! :)
$ git gc
...
Computing commit graph generation numbers: 100% (164264/164264), done.
$ ./git version
git version 2.20.1.775.g2313a6b87fe.dirty
# pu + one commit addressing
#
https://public-inbox.org/git/cagz79kaug3ntrpri5mlk6ag87idb_ltq_keilwz2hgz+-vs...@mail.gmail.com/
$ ./git -c
I see it is fixed in
https://public-inbox.org/git/20190122003020.9672-3-pclo...@gmail.com/
but not in 2722d068deb (SQUASH???, 2019-01-18)
On Thu, Jan 24, 2019 at 12:18 PM Junio C Hamano wrote:
>
> Jeff King writes:
>
> > When we run "git log --cc --stat -p --color-moved" starting at D, we get
> > this sequence of events:
> >
> > 1. The diff for D is using -p, so diff_flush() calls into
> > diff_flush_patch_all_file_pairs().
On Thu, Jan 24, 2019 at 4:26 AM Jeff King wrote:
>
> This started as a follow-up to my "something like this" bug-fix from
> last July:
>
> https://public-inbox.org/git/20180710203438.gb6...@sigill.intra.peff.net/
>
> (better late than never). But in the course of that, I discovered
> another real
On Thu, Jan 24, 2019 at 4:35 AM Jeff King wrote:
> Note that we have to tweak t4013's setup a bit to test this case, as the
> existing merges do not have any --summary results against their first
> parent. But since the merge at the tip of 'master' does add and remove
> files with respect to the
On Thu, Jan 24, 2019 at 4:34 AM Jeff King wrote:
>
> The --stat of a combined diff is defined as the first-parent stat,
> going all the way back to 965f803c32 (combine-diff: show diffstat with
> the first parent., 2006-04-17).
>
> Naturally, we gave --numstat the same treatment in 74e2abe5b7 (diff
sh the zero-ing of esm.nr into the conditional for "if
> (o->emitted_symbols)" to make it clear that we do not expect esm to hold
> any values if we did not just try to use it. With the code as it is
> written now, if we did encounter such a case (which I think would be a
> bug), we'd silently leak those values without even bothering to display
> them. With this change, we'd at least eventually show them, and somebody
> would notice.
Wow. Good call.
>
> Signed-off-by: Jeff King
Reviewed-by: Stefan Beller
But now that I look at the patch, there are actual changes, as you
indicated in the commit message. Just more than I expected.
This patch is
Reviewed-by: Stefan Beller
On Thu, Jan 24, 2019 at 10:08 AM Lucy Phipps wrote:
>
> Signed-off-by: Lucy Phipps
Could you state reasons for this patch?
Do we need to treat the gitweb images differently than the test images?
If so, how?
> ---
> gitweb/static/git-favicon.png | Bin 115 -> 106 bytes
> gitweb/static/git-logo.
On Mon, Jan 21, 2019 at 2:32 PM wrote:
>
> evolve: Implement oid_array_contains_nondestructive
I'd think I would word this
sha1-array: implement oid_array_contains_nondestructive
as for this patch it is not relevant what we we'll be using it for
later, but rather that it touches the oidset
On Tue, Jan 22, 2019 at 12:26 AM Jeff King wrote:
>
> On Tue, Jan 22, 2019 at 02:50:27AM -0500, Jeff King wrote:
>
> > There's no set agenda; we'll decide what to discuss that day. But if
> > anybody would like to mention topics they are interested in (whether you
> > want to present on them, or j
On Fri, Jan 18, 2019 at 3:18 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > 74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by
> > ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation
> > if the helper could not ensur
> I dunno. This is why I submitted the initial patch as the simplest fix. ;)
>
The first patch is
Reviewed-by: Stefan Beller
Diffing across both patches, this seems to be the relevant part:
---8<---
@@ -,14 +1116,13 @@ static void collect_some_attrs(const struct
index_stat
74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation
if the helper could not ensure that core.worktree is set correctly.
Signed-off-by: Stefan Beller
---
git-submodule.sh | 2 +-
1 file changed, 1
On Thu, Jan 17, 2019 at 6:33 AM Ævar Arnfjörð Bjarmason
wrote:
> > I sent a sneak peek [1] last year and got two good comments. I take it
> > people at least did not oppose to this. The most interesting parts are
> > at the top and bottom. The middle is just boring conversion, usually
> > one opt
On Thu, Jan 17, 2019 at 5:12 AM Nguyễn Thái Ngọc Duy wrote:
>
> Diff's internal option parsing is now done with 'struct option', which
> makes it possible to combine all diff options to range-diff and parse
> everything all at once. Parsing code becomes simpler,
Cool. I like the series up to here
On Thu, Jan 17, 2019 at 5:06 AM Nguyễn Thái Ngọc Duy wrote:
>
> These two are orthogonal. One is about unknown _option_ while the
> other non-option.
Though 0d260f9a09 ("parseopt: prevent KEEP_UNKNOWN and
STOP_AT_NON_OPTION from being used together", 2009-03-09)
seemed convincing to have this?
M
On Thu, Jan 17, 2019 at 9:32 AM Jeff King wrote:
>
> On Mon, Jan 14, 2019 at 05:25:07PM -0800, Jonathan Nieder wrote:
>
> > I've put a summary in https://crbug.com/git/28 to make this easier to
> > pick up where we left off. Summary from there of the upstream review:
> >
> > 1. Using urlencoding
> --- /dev/null
> +++ b/t/t2405-worktree-submodules.sh
> @@ -0,0 +1,42 @@
> +#!/bin/sh
> +
> +test_description='multiple worktrees as superprojects'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'set up submodule source' '
> + test_create_repo submodsrc &&
> + (
> + cd
> The third problem is a big and complicaed one. Submodule clones
complicated
> (inside the superproject) are per-worktree. So if you have two
> worktrees, and these have one submodule, you need space for _two_
> clones. This is definitely not elegant. The tenative plan is to move
tentative?
>
On Tue, Jan 15, 2019 at 11:32 AM Junio C Hamano wrote:
>
> Jeff King writes:
>
> > On Sat, Jan 12, 2019 at 10:51:42AM -0800, Stefan Beller wrote:
> >
> >> > I wonder, and not as "you should do this" feedback on this series, just
> >>
> >
> Stefan was routinely running coverity, though I haven't seen results in
> a while. I think we should make sure that continues, as it did turn up
> some useful results (and a lot of cruft, too, but on the whole I have
> found it useful).
coverity had some outage (end of last year?-ish) and then c
> I wonder, and not as "you should do this" feedback on this series, just
There is a getenv_safe() in environment.c, but I guess a xgetenv() that
takes the same parameters as getenv() is better for ease of use.
On Thu, Jan 10, 2019 at 11:36 AM Jonathan Tan wrote:
>
> When fetching using protocol v2, the remote may send a "shallow-info"
> section if the client is shallow. If so, Git as the client currently
> takes the shallow file lock, even if the "shallow-info" section is
> empty.
>
> This is not a prob
> I had a look at
> https://gitlab.com/pclouds/git/commits/submodules-in-worktrees,
> and it doesn't seem to be quite all okay.
>
> The submodule update step of the repro (that breaks the config on 2.20) emits
> an error message instead, and leaves the config unchanged:
>git -C b2 submodule up
> * sb/submodule-recursive-fetch-gets-the-tip (2018-12-09) 9 commits
> - fetch: ensure submodule objects fetched
> - submodule.c: fetch in submodules git directory instead of in worktree
> - submodule: migrate get_next_submodule to use repository structs
> - repository: repo_submodule_init to t
o
> come in on them before doing anything, and now it is more than a
> month ago X-<.
I have reviewed the whole series again, and still have
no comment on them, i.e. the series as-is in v2 is
Reviewed-by: Stefan Beller
if that helps.
d
$ git commit -m test
$ git show
commit 463ce75588378a8c5c0ba1fd427cd02c87e2078a (HEAD -> master)
Author: Stefan Beller
Date: Wed Jan 9 14:31:09 2019 -0800
test
diff --git a/.gitmodules b/.gitmodules
index bf393d9..80e7d91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
On Wed, Jan 9, 2019 at 1:37 PM Stefan Beller wrote:
>
> > > Yikes, the conflicts with sb/more-repo-in-api is quite irritating.
> > > I think I'll postpone the later parts of this series and ask this to
> > > be sent after sb/more-repo-in-api matures a b
On Fri, Dec 28, 2018 at 8:39 PM Konstantin Ryabitsev
wrote:
>
> On Sat, Dec 29, 2018 at 03:56:21AM +, Eric Wong wrote:
> > Hey all, I just added this to the TODO file for public-inbox[1] but
> > obviously it's intended for git.git (meta@public-inbox cc-ed):
> >
> > > +* Contribute something li
> > Yikes, the conflicts with sb/more-repo-in-api is quite irritating.
> > I think I'll postpone the later parts of this series and ask this to
> > be sent after sb/more-repo-in-api matures a bit mroe.
>
> There were several conflicts, but it was mostly just tedious textual
> fixups. I pushed the r
On Tue, Jan 8, 2019 at 1:36 PM Junio C Hamano wrote:
>
> Jonathan Tan writes:
>
> >> The in-core repository instances are passed through more codepaths.
> >
> > I think this is ready to be considered for merging to next. This series
> > looks
> > good both to Stolee [1] and to me (I replied to
On Tue, Jan 8, 2019 at 10:26 AM Junio C Hamano wrote:
>
> Barret Rhoden writes:
>
> >> A policy decision like the above two shouldn't be hardcoded in the
> >> feature like this, but should be done as a separate option. By
> >> default, these shouldn't be marked with '*', as the same tools you
>
On Thu, Dec 27, 2018 at 8:26 AM Nguyễn Thái Ngọc Duy wrote:
>
> Bitfield addresses cannot be passed around in a pointer. This makes it
> hard to use parse-options to set/unset them. Turn this struct to
> normal integers. This of course increases the size of this struct
> multiple times, but since
> Unfortunately I'm not sure of an easy fix. We'd have to tell the log
> code "figure out if you're going to show the commit, but don't actually
> show anything", which means respecting the count flag virtually
> everywhere that would produce output.
This is (partially) solved for commit parts alr
On Tue, Jan 8, 2019 at 2:16 PM Tomasz Śniatowski wrote:
>
> After upgrading to 2.20.1 I noticed in some submodule+worktree scenarios git
> will break the submodule configuration. Reproducible with:
> git init a && (cd a; touch a; git add a; git commit -ma)
> git init b && (cd b; git submod
On Sat, Jan 5, 2019 at 2:47 PM Linus Torvalds
wrote:
>
> This is a ridiculous patch. And I understand entirely if nobody else
> cares, because I don't think anybody else has ever even noticed.
>
> It turns out that I still use "git rev-list" outside of some hard-core
> scripting for one silly reas
.)
This code of push_submodule() is exercised in t5531 and continues
to work, showing that the submodule odbc is not needed.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
submodule.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/submodule.c b/submodule.c
index 4486ff664b
Pass the object pool to free_commit_buffer and release_commit_memory,
such that we can eliminate access to 'the_repository'.
Also remove the TODO in release_commit_memory, as commit->util was
removed in 9d2c97016f (commit.h: delete 'util' field in struct commit,
2018-05-19)
git_pathdup uses the_repository internally, but the macro
REPO_GIT_PATH_FUNC is specifically made for arbitrary repositories.
Switch to repo_git_path which works on arbitrary repositories.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
path.h | 2 +-
1 file changed, 1 insertion
Convert all functions to handle arbitrary repositories in commit-graph.c
that are used by functions taking a repository argument already.
Notable exclusion is write_commit_graph and its local functions as that
only works on the_repository.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C
to 0, so any accidental access is more likely to be found.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
cache.h| 2 ++
t/helper/test-repository.c | 10 ++
2 files changed, 12 insertions(+)
diff --git a/cache.h b/cache.h
index 59c8a93046..8864d7ec15
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
contrib/coccinelle/the_repository.pending.cocci | 10 ++
pretty.c| 15 ---
pretty.h| 7 ++-
3 files changed, 24 insertions
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit.c| 6 --
commit.h| 7 ++-
contrib/coccinelle/the_repository.pending.cocci | 8
3 files changed, 18 insertions(+), 3 deletions
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit-reach.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/commit-reach.c b/commit-reach.c
index 81015830cb..b3b1f62aba 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -216,7 +216,8
Similarly to previous patches, the get_merge_base functions are used
often in the code base, which makes migrating them hard.
Implement the new functions, prefixed with 'repo_' and hide the old
functions behind a wrapper macro.
Signed-off-by: Stefan Beller
Signed-off-by: Juni
ut do not apply
the resulting patch to keep the diff of this patch small.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
contrib/coccinelle/the_repository.pending.cocci | 12
object-store.h | 10 --
2 files changed, 20 inser
Just like the previous commit, parse_commit and friends are used a lot
and are found in new patches, so we cannot change their signature easily.
Re-introduce these function prefixed with 'repo_' that take a repository
argument and keep the original as a shallow macro.
Signed-off-
I realized next has not been rewound, so I can resend sb/more-repo-in-api,
which I hereby do. The changes are minimal and address the only comment
by Jonathan so far.
Thanks,
Stefan
Stefan Beller (23):
sha1_file: allow read_object to read objects in arbitrary repositories
packfile: allow
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit-reach.c | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/commit-reach.c b/commit-reach.c
index 67c2e43d5e..a53b31e6a2 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -95,7 +95,9 @@ static
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
.../coccinelle/the_repository.pending.cocci | 30 +++
object-store.h| 22 ++
sha1-file.c | 15 ++
3 files changed, 56 insertions
read_object_file_extended is not widely used, so migrate it all at once.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
object-store.h | 5 +++--
sha1-file.c| 11 ++-
streaming.c| 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/object
As the function is file local and not widely used, migrate it all at once.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit-reach.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/commit-reach.c b/commit-reach.c
index 9f79ce0a22
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit-reach.c | 15 +--
commit-reach.h | 12 ++--
contrib/coccinelle/the_repository.pending.cocci | 17 +
3 files changed, 36
This converts the 'show_submodule_header' function to use
the repository API properly, such that the submodule objects
are not added to the main object store.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
submod
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit.h| 8
contrib/coccinelle/the_repository.pending.cocci | 9 +
pretty.c| 13 +++--
3 files changed, 24 insertions(+), 6
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit.c| 8 +---
commit.h| 7 ++-
contrib/coccinelle/the_repository.pending.cocci | 8
3 files changed, 19 insertions(+), 4 deletions
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
commit-reach.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/commit-reach.c b/commit-reach.c
index a53b31e6a2..81015830cb 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -156,7 +156,7 @@ struct
In 8e4b0b6047 (object.c: allow parse_object to handle
arbitrary repositories, 2018-06-28), we forgot to pass the
repository down to the read_object_file.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
object.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff
has_packed_and_bad is not widely used, so just migrate it all at once.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
packfile.c | 5 +++--
packfile.h | 2 +-
sha1-file.c | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/packfile.c b/packfile.c
index
Allow read_object (a file local functon in sha1_file) to
handle arbitrary repositories by passing the repository down
to oid_object_info_extended.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
sha1-file.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff
ranch 'sb/submodule-core-worktree'", 2018-09-07)
[3] 4d6d6ef1fc (Merge branch 'sb/submodule-update-in-c', 2018-09-17)
[4] 74d4731da1 (submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree, 2018-08-13)
Stefan Beller (4):
submodule update: add regress
8-09-17),
specifically 74d4731da1 (submodule--helper: replace
connect-gitdir-workingtree by ensure-core-worktree, 2018-08-13) is
present, we already check and ensure core.worktree is set when
populating a new work tree, such that we can re-introduce the commits
that unset core.worktree when removing the wo
74d4731da1 (submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree, 2018-08-13) missed to update the BUG message.
Fix it.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/submodule
d6ef1fc (Merge branch 'sb/submodule-update-in-c', 2018-09-17), such
that we can reintroduce 984cd77ddb now.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 2 ++
t/lib-submodule-update.sh | 2 +-
t/t7400-submodule-basic.sh | 5 +
3 files changed, 8 insertions(+),
't
produce errors as pointed out in f178c13fda.
The place to add such a regression test may look odd in t7412, but
that is the best place as there we setup old style submodule setups
explicitly.
Signed-off-by: Stefan Beller
---
t/t7412-submodule-absorbgitdirs.sh | 7 ++-
1 file changed, 6
On Thu, Dec 13, 2018 at 2:44 PM Yaroslav O Halchenko
wrote:
>
>
> On Thu, 13 Dec 2018, Stefan Beller wrote:
>
> > > and kaboom -- we have a new test. If we decide to test more -- just tune
> > > up
> > > test_expect_unchanged_submodule_status and done --
On Thu, Dec 13, 2018 at 9:19 AM Yaroslav Halchenko wrote:
>
> Example - on http://datasets.datalad.org we have a few hundred datasets
> organized into a hierarchy as git submodules. Each git submodules carries
> its
> own .git/ directory so they are "self sufficient" and we could readily assess
> > The current situation is definitely a problem. If I am in a worktree,
> > using "head" should be the same as "HEAD".
By any chance, is your file system case insensitive?
That is usually the source of confusion for these discussions.
Maybe in worktree code we have a spillover between path
res
On Thu, Dec 13, 2018 at 8:42 AM Yaroslav O Halchenko
wrote:
>
> Thank you Stefan for the review and please pardon my delay with the
> reply, and sorry it got a bit too long by the end ;)
>
> On Wed, 12 Dec 2018, Stefan Beller wrote:
> > Thanks for the patches. The first p
90efe595c5 (builtin/submodule--helper: factor
out submodule updating, 2018-08-03). Fix it.
Reported-by: Sjon Hortensius
Signed-off-by: Junio C Hamano
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 2 +-
t/t5526-fetch-submodules.sh | 2 ++
2 files changed, 3 insertions(+), 1 deletion
On Thu, Dec 13, 2018 at 6:17 AM Junio C Hamano wrote:
>
> Sjon Hortensius writes:
>
> > When switching to 2.20 our `git submodule update' (which clones
> > through ssh) broke because our ssh-server rejected the ~20
> > simultaneous connections the git-client makes. This seems to be caused
> > by
> Unlike the step 2/4 I commented on, this does explain what this
> wants to do and why, at least when looked from sideways. Is the
> above saying the same as the following two-liner?
>
> An ealier mistake while rebasing to produce 74d4731da1
> failed to update this BUG message. F
On Fri, Dec 7, 2018 at 9:57 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > A couple days before the 2.19 release we had a bug report about
> > broken submodules[1] and reverted[2] the commits leading up to them.
> >
> > The behavior of said bug f
documentation, and annotate setting of `submodule_prefix`
to indicate we're dealing with a submodule repository.
Signed-off-by: Stefan Beller
---
> I'll incorporate these changes once resending.
... only to realize it hit next already, so we'd prefer updates instead
of resendin
Signed-off-by: Stefan Beller
---
On Thu, Nov 15, 2018 at 11:54 AM Jonathan Tan wrote:
> Other than that, this patch looks good.
I'll incorporate these changes once resending.
Stefan
submodule.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/submo
On Wed, Dec 12, 2018 at 11:47 AM Duy Nguyen wrote:
>
> I'm not going to bother you with patches (yet) but I could use a few
> eyeballs to check the help usage (and perhaps the option grouping) for
> commands that take diff options.
The grouping looks good from a cursory view, but ...
> Forget ab
On Mon, Dec 10, 2018 at 8:09 PM Yaroslav Halchenko
wrote:
Thanks for the patches. The first patch looks good to me!
> [PATCH 2/2] RF+ENH(TST): compare the entire list of submodule status
> --recursive to stay intact
The subject is a bit cryptic (specifically the first part before the
colon), m
> But again, I must confess, that either I forgot or just do not see a
> clear use-case/demand for submodule.update config myself any longer,
ok, let's drop that patch then.
> Probably I need to try "submodules update --merge" to see what is that
> rough edge which makes it different from the pot
> It is amazing to me how much my perspective changed when I actually had to
> teach Git to new users. Things that I live with easily all of a sudden
> become these unnecessarily confusing road blocks that make it *so hard* to
> actually use Git.
I see. Without the -y patch, this series looks good
> (For the Git project itself, we long ago realized that putting raw color
> codes into the source is a big pain when working with diffs, and we
> instead use tools like t/test-lib-functions.sh's test_decode_color).
And also we hid the colors behind #defines and such.
> > * Context lines do not b
On Mon, Dec 10, 2018 at 10:06 AM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> To repack using a multi-pack-index, first sort all pack-files by
> their modified time. Second, walk those pack-files from oldest
> to newest, adding the packs to a list if they are smaller than t
> * sb/more-repo-in-api (2018-11-14) 23 commits
> (merged to 'next' on 2018-11-19 at e5d2a129da)
> [..]
> The in-core repository instances are passed through more codepaths.
>
> Will cook in 'next'.
> cf. <20181115221254.45373-1-jonathanta...@google.com>
Looking into that.
> * sb/submodule-r
On Mon, Dec 10, 2018 at 10:06 AM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> In an environment where the multi-pack-index is useful, it is due
> to many pack-files and an inability to repack the object store
> into a single pack-file. However, it is likely that many of the
On Mon, Dec 10, 2018 at 10:06 AM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The multi-pack-index tracks objects in a collection of pack-files.
> Only one copy of each object is indexed, using the modified time
> of the pack-files to determine tie-breakers. It is possible
On Mon, Dec 10, 2018 at 6:43 AM Phillip Wood wrote:
>
> On 06/12/2018 18:11, Stefan Beller wrote:
> > On Thu, Dec 6, 2018 at 6:58 AM Phillip Wood
> > wrote:
> >
> >>> So is there some "must be at least two consecutive lines" condition for
>
Signed-off-by: Stefan Beller
---
> > So you are proposing a variable like submodule.update
> [...]
>
> Glad to hear that. Not sure though I would know where to stick my
> nose to figure out what to change. ;-)
The update_module is computed via the submodule--helpers
update-m
On Mon, Dec 10, 2018 at 2:08 PM Johannes Sixt wrote:
>
> Am 10.12.18 um 20:04 schrieb Johannes Schindelin via GitGitGadget:
> > The idea was brought up by Paul Morelle.
> >
> > To be honest, this idea of rescheduling a failed exec makes so much sense
> > that I wish we had done this from the get-g
On Sat, Dec 8, 2018 at 7:45 AM Yaroslav Halchenko wrote:
> I wondered, if you think it would be sensible to also add of
> submodule.update which would be considered before submodule.SUBMODULE.update
> variable possibly defined per submodule. That would be more inline with
> desire
> to use any
On Fri, Dec 7, 2018 at 8:21 PM Yaroslav Halchenko wrote:
>
>
> On Fri, 07 Dec 2018, Yaroslav Halchenko wrote:
>
>
> > On Fri, 07 Dec 2018, Stefan Beller wrote:
> > > > the initial "git submodule update --reset-hard" is pretty much a
> > > &g
On Sun, Dec 9, 2018 at 2:25 AM Nguyễn Thái Ngọc Duy wrote:
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> bisect.c | 3 ++-
> builtin/config.c | 3 ++-
> builtin/push.c | 4 +++-
> convert.c | 3 ++-
> credential-cache--daemon.c | 3 ++-
>
't
produce errors as pointed out in f178c13fda.
The place to add such a regression test may look odd in t7412, but
that is the best place as there we setup old style submodule setups
explicitly.
Signed-off-by: Stefan Beller
---
t/t7412-submodule-absorbgitdirs.sh | 7 ++-
1 file changed, 6
core.worktree is set after update, 2018-06-18)
was relied on by other commits such as 984cd77ddb.
Keep the offending commit reverted, but its functionality came back via
4d6d6ef1fc (Merge branch 'sb/submodule-update-in-c', 2018-09-17), such
that we can reintroduce 984cd77ddb now.
ert "Merge branch 'sb/submodule-core-worktree'", 2018-09-07)
[3] 4d6d6ef1fc (Merge branch 'sb/submodule-update-in-c', 2018-09-17)
[4] 74d4731da1 (submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree, 2018-08-13)
Stefan Beller (4):
submodule up
lty, but without
the accompanying change of the followup, we'd have an incomplete workflow
of setting `core.worktree` again, when it is needed such as checking out
a revision that contains a submodule.
So re-introduce that commit as-is, focusing on fixing up the followup
Signed-off-by: Stefan Belle
ct-gitdir-workingtree by ensure-core-worktree, 2018-08-13).
Fix the error message.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index d38113a31a..31ac30
On Fri, Dec 7, 2018 at 1:40 PM Jonathan Nieder wrote:
>
> Brandon Williams wrote:
>
> > Signed-off-by: Brandon Williams
> > ---
> > .mailmap | 1 +
> > 1 file changed, 1 insertion(+)
>
> I can confirm that this is indeed the same person.
What would be more of interest is why we'd be interested
On Thu, Dec 6, 2018 at 5:23 PM Yaroslav Halchenko wrote:
> > There was a proposal to "re-attach HEAD" in the submodule, i.e.
> > if the branch branch points at the same commit, we don't need
> > a detached HEAD, but could go with the branch instead.
>
> if I got the idea right, if we are talking
On Thu, Dec 6, 2018 at 12:09 PM Johannes Schindelin
wrote:
>
> Hi,
>
> On Wed, 5 Dec 2018, Jeff King wrote:
>
> > The model that fits more naturally with how Git is implemented would be
> > to use submodules. There you leak the hash of the commit from the
> > private submodule, but that's probably
1 - 100 of 7868 matches
Mail list logo
