Antonio Ospite writes:
> - my git terminology may still be a little off: do "work tree" and
> "work directory" mean the same thing?
Just on this tangent.
When we talk about the current working directory of a process
returned by getcwd((3) call, we typically spell that word fully (or
say
Junio C Hamano writes:
> Olga Telezhnaya writes:
>
>> Start using oid_object_info_extended(). So, if info from this function
>> is enough, we do not need to get and parse whole object (as it was before).
>> It's good for 3 reasons:
>> 1. Some Git commands potentially will work faster.
>> 2. It's
Olga Telezhnaya writes:
> Start using oid_object_info_extended(). So, if info from this function
> is enough, we do not need to get and parse whole object (as it was before).
> It's good for 3 reasons:
> 1. Some Git commands potentially will work faster.
> 2. It's much easier to add support for o
On Mon, May 14, 2018 at 3:58 AM, Antonio Ospite wrote:
> When the .gitmodules file is not available in the working directory, try
> using HEAD:.gitmodules from the index.
I think HEAD:.gitmodules is different than the index (the former is
part of the latest commit, whereas the index could have ch
Christian Couder writes:
> diff --git a/odb-helper.h b/odb-helper.h
> new file mode 100644
> index 00..61d2ad082b
> --- /dev/null
> +++ b/odb-helper.h
> @@ -0,0 +1,13 @@
> +#ifndef ODB_HELPER_H
> +#define ODB_HELPER_H
> +
Here is a good space to write a comment on what this structure and
On Mon, May 14, 2018 at 3:58 AM, Antonio Ospite wrote:
> Add a new 'config' subcommand to 'submodule--helper', this extra level
> of indirection makes it possible to add some flexibility to how the
> submodules configuration is handled.
>
> Signed-off-by: Antonio Ospite
> ---
> builtin/submodule
Christian Couder writes:
> The callers of the fetch_object() and fetch_objects() might
> be interested in knowing if these functions succeeded or not.
>
> Signed-off-by: Christian Couder
> ---
> fetch-object.c | 15 +--
> fetch-object.h | 6 +++---
> sha1-file.c| 4 ++--
> 3 f
I know I said the patches looked okay earlier, but I just noticed something...
On Thu, May 10, 2018 at 2:19 PM, Stefan Beller wrote:
> case 1:
> - MERGE_WARNING(path, "not fast-forward");
> - fprintf(stderr, "Found a possible merge resolution "
> -
On Mon, May 14, 2018 at 3:58 AM, Antonio Ospite wrote:
> Tests 5 and 8 in t/t7411-submodule-config.sh add two commits with
> invalid lines in .gitmodules but then only the second commit is removed.
>
> This may affect subsequent tests if they assume that the .gitmodules
> file has no errors.
>
> S
On Mon, May 14, 2018 at 3:58 AM, Antonio Ospite wrote:
> Introduce a new config_gitmodules_set function to write config values to the
> .gitmodules file.
>
> This is in preparation for a future change which will use the function
> to write to the .gitmodules file in a more controlled way instead o
Hi Leif,
On Mon, May 14, 2018 at 1:57 PM, Leif Middelschulte
wrote:
Thanks for updating the patch on top of Stefan's series. :-)
> /* Case #1: a is contained in b or vice versa */
> if (in_merge_bases(commit_a, commit_b)) {
> oidcpy(result, b);
> +
Hi Antonio,
thanks for sending this series! Happy to review it!
> - my git terminology may still be a little off: do "work tree" and
> "work directory" mean the same thing?
Back in the old days, you had a "worktree" which is a directory where
things are checked out and you modify files. It
On Mon, May 14, 2018 at 3:58 AM, Antonio Ospite wrote:
> The config_from_gitmodules() function is a good candidate for
> a centralized point where to read the gitmodules configuration file.
It is very tempting to use that function. However it was introduced
specifically to not do that. ;)
See th
Any other caller of 'repo_read_index' dies upon a negative return of
it, so grep should, too.
Signed-off-by: Stefan Beller
---
Found while reviewing the series
https://public-inbox.org/git/20180514105823.8378-1-...@ao2.it/
builtin/grep.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
On Mon, May 14, 2018 at 1:57 PM, Leif Middelschulte
wrote:
> From: Leif Middelschulte
>
> Inform the user about an automatically fast-forwarded submodule. The silent
> merge
> behavior was introduced by commit 68d03e4a6e44 ("Implement automatic
> fast-forward
> merge for submodules", 2010-07-07
> 22 files changed, 514 insertions(+), 571 deletions(-)
> create mode 100644 refspec.c
> create mode 100644 refspec.h
This looks promising. I'll hope to find time to review it.
Stefan
On Mon, May 14 2018, demerphq wrote:
> The first time I tried to use --no-ff I tried to do something like this:
>
> git checkout master
> git commit -a -m'whatever'
> git commit -a -m'whatever2'
> git merge --no-ff origin/master
>
> and was disappointed when "it didn't work" and git told
The first time I tried to use --no-ff I tried to do something like this:
git checkout master
git commit -a -m'whatever'
git commit -a -m'whatever2'
git merge --no-ff origin/master
and was disappointed when "it didn't work" and git told me there was
nothing to do as the branch was up to da
Convert the set of push refspecs stored in 'struct remote' to use
'struct refspec'.
Signed-off-by: Brandon Williams
---
builtin/push.c | 10 +-
builtin/remote.c | 14 +++---
remote.c | 23 +--
remote.h | 6 ++
4 files changed, 23 inserti
Convert 'match_push_refs()' to use struct refspec.
Signed-off-by: Brandon Williams
---
remote.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/remote.c b/remote.c
index 191855118..bce6e7ce4 100644
--- a/remote.c
+++ b/remote.c
@@ -1312,7 +1312,7 @@ int check_pu
Convert 'cmd_clone()' to use 'refspec_item_init()' instead of relying on
the old 'parse_fetch_refspec()' to initialize a single refspec item.
Signed-off-by: Brandon Williams
---
builtin/clone.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/builtin/clone.c b/built
Convert 'get_ref_map()' to take a 'struct refspec' as a parameter
instead of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 43 ---
1 file changed, 20 insertions(+), 23 deletions(-)
diff --git a/builtin/fetch.c b/bu
Convert 'fetch_one()' to use 'struct refspec'.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 46 +++---
1 file changed, 19 insertions(+), 27 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 30083d4bc..769f9d2be 100644
--- a/builti
Convert fast-export to use 'struct refspec' instead of using a list of
refspec_item's.
Signed-off-by: Brandon Williams
---
builtin/fast-export.c | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 6f105dc7
Convert the refspecs in builtin/push.c to be stored in a 'struct
refspec' instead of being stored in a list of 'struct refspec_item's.
Signed-off-by: Brandon Williams
---
builtin/push.c | 38 +++---
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/b
Convert 'transport_push()' to take a 'struct refspec' as a
parameter instead of an array of strings which represent
refspecs.
Signed-off-by: Brandon Williams
---
builtin/push.c | 3 +--
transport.c| 17 +++--
transport.h| 2 +-
3 files changed, 9 insertions(+), 13 deletions
Convert 'apply_refspecs()' to take a 'struct refspec' as a parameter instead
of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
builtin/fast-export.c | 2 +-
remote.c | 15 ++-
remote.h | 3 +--
transport-helper.c| 6 +++---
4 fil
Convert send-pack.c to store refspecs in a 'struct refspec' instead of
as an array of 'const char *'.
Signed-off-by: Brandon Williams
---
builtin/send-pack.c | 24 +++-
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
in
Convert 'prune_refs()' to take a 'struct refspec' as a parameter instead
of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 86a7f103f..eebe
Convert 'check_push_refs()' to take a 'struct refspec' as a parameter
instead of an array of 'const char *'.
Signed-off-by: Brandon Williams
---
remote.c| 14 +-
remote.h| 2 +-
transport.c | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/remote.c b/r
Convert 'push_unpushed_submodules()' to take a 'struct refspec' as a
parameter instead of an array of 'const char *'.
Signed-off-by: Brandon Williams
---
submodule.c | 19 +--
submodule.h | 3 ++-
transport.c | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --gi
Convert 'match_push_refs()' to take a 'struct refspec' as a parameter
instead of an array of 'const char *'.
Signed-off-by: Brandon Williams
---
builtin/remote.c| 3 +--
builtin/send-pack.c | 2 +-
http-push.c | 3 +--
remote.c| 21 -
remote.h
Remove 'transprot_verify_remote_names()' because all callers have
migrated to using 'struct refspec' which performs the same checks in
'parse_refspec()'.
Signed-off-by: Brandon Williams
---
builtin/send-pack.c | 2 --
transport.c | 24
transport.h | 2 -
Convert http-push.c to store refspecs in a 'struct refspec' instead of
in an array of 'const char *'.
Signed-off-by: Brandon Williams
---
http-push.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/http-push.c b/http-push.c
index f308ce019..a724ef03f 100644
Convert 'match_explicit_refs()' to take a 'struct refspec' as a
parameter instead of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
remote.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/remote.c b/remote.c
index 0879ee587..73d462f24 100644
--
Convert 'get_ref_match()' to take a 'struct refspec' as a parameter
instead of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
remote.c | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/remote.c b/remote.c
index 3d7bc7504..0879e
Convert 'query_refspecs()' to take a 'struct refspec' as a parameter instead
of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
builtin/push.c | 3 +--
remote.c | 10 +-
remote.h | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/bui
Move the error checking for using the "--mirror", "--all", and "--tags"
options earlier and explicitly check for the presence of the flags
instead of checking for a side-effect of the flag.
Signed-off-by: Brandon Williams
---
builtin/push.c | 31 ++-
1 file changed, 1
Convert 'get_stale_heads()' to take a 'struct refspec' as a parameter instead
of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 2 +-
builtin/remote.c | 3 +--
remote.c | 18 +-
remote.h | 2 +-
4 files changed, 12 inser
Convert 'do_fetch()' to take a 'struct refspec' as a parameter instead
of a list of 'struct refspec_item'.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index e2f2f290e..733feb1
Now that there are no callers of 'parse_push_refspec()',
'parse_fetch_refspec()', and 'free_refspec()', remove these
functions.
Signed-off-by: Brandon Williams
---
refspec.c | 49 -
refspec.h | 5 -
2 files changed, 54 deletions(-)
diff --git
Convert the refspecs in transport-helper.c to be stored in a
'struct refspec'.
Signed-off-by: Brandon Williams
---
transport-helper.c | 38 --
1 file changed, 12 insertions(+), 26 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index b156a37
Convert the refmap in builtin/fetch.c to be stored in a
'struct refspec'.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 769f9d2be..e2f2f290e 100644
--- a/builtin/f
Convert the set of fetch refspecs stored in 'struct remote' to use
'struct refspec'.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 20 ++--
builtin/remote.c | 18 +-
remote.c | 24 ++--
remote.h | 5 +
4 files chan
Convert the logic in 'transport_push()' which calculates a list of
ref-prefixes to use 'struct refspec'.
Signed-off-by: Brandon Williams
---
transport.c | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/transport.c b/transport.c
index 3ad4d37dc..181db4d4d 1006
Convert 'check_push_refs()' to use 'struct refspec'.
Signed-off-by: Brandon Williams
---
remote.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/remote.c b/remote.c
index 89820c476..191855118 100644
--- a/remote.c
+++ b/remote.c
@@ -1282,12 +1282,14 @@ static void
Convert 'valid_fetch_refspec()' to use the new 'parse_refspec()'
function to only parse a single refspec an eliminate an allocation.
Signed-off-by: Brandon Williams
---
refspec.c | 17 -
refspec.h | 3 ++-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/refspec.
Convert 'get_tracking_branch()' to use 'refspec_item_init()' instead of
the old 'parse_fetch_refspec()' function.
Signed-off-by: Brandon Williams
---
builtin/pull.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 5a79deae5..09575f
Introduce 'struct refspec', an abstraction around a collection of
'struct refspec_item's much like how 'struct pathspec' holds a
collection of 'struct pathspec_item's.
A refspec struct also contains an array of the original refspec strings
which will be used to facilitate the migration to using th
In preperation for performing a refactor on refspec related code, move
the refspec parsing logic into its own file.
Signed-off-by: Brandon Williams
---
Makefile| 1 +
branch.c| 1 +
builtin/clone.c | 1 +
builtin/fast-export.c | 1
Convert 'push_check()' to use 'struct refspec'.
Signed-off-by: Brandon Williams
---
builtin/submodule--helper.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index c0c4db007..88a149a2c 100644
--- a/buil
Factor out the logic which parses a single refspec into its own
function. This makes it easier to reuse this logic in a future patch.
Signed-off-by: Brandon Williams
---
refspec.c | 195 +-
1 file changed, 104 insertions(+), 91 deletions(-)
d
In preperation for introducing an abstraction around a collection of
refspecs (much like how a 'struct pathspec' is a collection of 'struct
pathspec_item's) rename the existing 'struct refspec' to 'struct
refspec_item'.
Signed-off-by: Brandon Williams
---
branch.c| 6 ++---
When working on protocol v2 I noticed that working with refspecs was a
little difficult because of the various api's that existed. Some
functions expected an array of "const char *" while others expected an
array of "struct refspec". In all cases a length parameter needed to be
passed as a parame
Derrick Stolee writes:
> On 5/12/2018 10:00 AM, Jakub Narebski wrote:
>> Derrick Stolee writes:
>>> On 5/4/2018 3:40 PM, Jakub Narebski wrote:
With early parts of commit-graph feature (ds/commit-graph and
ds/lazy-load-trees) close to being merged into "master", see
https://pub
From: Leif Middelschulte
Inform the user about an automatically fast-forwarded submodule. The silent
merge
behavior was introduced by commit 68d03e4a6e44 ("Implement automatic
fast-forward
merge for submodules", 2010-07-07)).
Signed-off-by: Leif Middelschulte
---
merge-recursive.c | 4
From: Leif Middelschulte
This patch is in response to Stefan Beller's Commit 0357af480
("merge-recursive: i18n submodule merge output and respect verbosity",
2018-05-10) and is based on the changes it provided.
Leif Middelschulte (1):
Inform about fast-forwarding of submodules during merge
m
On Mon, May 14, 2018 at 05:44:06PM +, Barodia, Anjali (Nokia - IN/Noida)
wrote:
> Hi Support,
>
>
> I was trying to push local git to another git on gerrit, but stuck with an
> hook error.
> This is a very large repo and while running the command "git push origin
> --all"
> I am getting th
Am 14.05.2018 um 19:26 schrieb Duy Nguyen:
> On Mon, May 14, 2018 at 7:03 PM, Andreas Heiduk wrote:
>> Am 08.05.2018 um 17:24 schrieb Duy Nguyen:
>>> On Mon, Apr 23, 2018 at 7:36 AM, Eric Sunshine
>>> wrote:
I haven't looked at the implementation, so this may be an entirely
stupid sugg
Signed-off-by: Ramsay Jones
---
Hi Duy,
If you need to re-roll your 'nd/commit-util-to-slab' branch, could
you please squash this into the relevant patch (commit 37de2f0a93,
"merge: use commit-slab in merge remote desc instead of commit->util",
2018-05-13).
Also, my 'static-check.pl' script ha
Hello world,
A new week has begun, but how was the last one? I posted a new blog post
about it [1].
Any feedback is greatly appreciated! Thank you!
[1]
https://ungps.github.io/
Best regards,
Paul
On 05/12, Antonio Ospite wrote:
> On Wed, 9 May 2018 10:19:50 -0700
> Brandon Williams wrote:
>
> > On 05/09, Antonio Ospite wrote:
> > > In commit dc8441fdb ("config: don't implicitly use gitdir or commondir",
> > > 2017-06-14) the function git_config_with_options was renamed to
> > > config_wit
On 05/14, Antonio Ospite wrote:
> The config_from_gitmodules() function is a good candidate for
> a centralized point where to read the gitmodules configuration file.
>
> Add a repo argument to it to make the function more general, and adjust
> the current callers in cmd_fetch and update-clone.
>
On 5/14/2018 1:30 PM, Duy Nguyen wrote:
On Mon, May 14, 2018 at 6:07 PM, Duy Nguyen wrote:
On Mon, May 14, 2018 at 04:52:29PM +0900, Junio C Hamano wrote:
Nguyễn Thái Ngọc Duy writes:
diff --git a/commit.h b/commit.h
index 838f6a6b26..70371e111e 100644
--- a/commit.h
+++ b/commit.h
@@ -18,
On 14.05.18 18:08, Frank Schäfer wrote:
> What does ^M at the end of lines in the output of 'git diff' mean ?
>
> Thanks,
> Frank
>
^M is the representation of a "Carriage Return" or CR.
Under Linux/Unix/Mac OS X a line is terminated with a single
"line feed", LF.
Windows typically uses CRLF at
Hi Support,
I was trying to push local git to another git on gerrit, but stuck with an hook
error.
This is a very large repo and while running the command "git push origin --all"
I am getting this errors:
remote: (W) 92e19d4: too many commit message lines longer than 70 characters;
manually wr
On Mon, May 14, 2018 at 6:28 AM, SZEDER Gábor wrote:
> The last two tests 'editor with a space' and 'core.editor with a
> space' in 't7005-editor.sh' need the SPACES_IN_FILENAMES prereq to
> ensure that they are only run on filesystems that allow, well, spaces
> in filesnames. However, we have be
On Monday, May 14, 2018 05:32:35 PM Barodia, Anjali wrote:
> I was trying to push local git to another git on gerrit,
> but stuck with an hook error. This is a very large repo
> and while running the command "git push origin --all" I
> am getting this errors:
>
> remote: (W) 92e19d4: too many comm
Hi Support,
I was trying to push local git to another git on gerrit, but stuck with an hook
error.
This is a very large repo and while running the command "git push origin --all"
I am getting this errors:
remote: (W) 92e19d4: too many commit message lines longer than 70 characters;
manually wr
On Mon, May 14, 2018 at 6:07 PM, Duy Nguyen wrote:
> On Mon, May 14, 2018 at 04:52:29PM +0900, Junio C Hamano wrote:
>> Nguyễn Thái Ngọc Duy writes:
>>
>> > diff --git a/commit.h b/commit.h
>> > index 838f6a6b26..70371e111e 100644
>> > --- a/commit.h
>> > +++ b/commit.h
>> > @@ -18,12 +18,16 @@
On Mon, May 14, 2018 at 7:03 PM, Andreas Heiduk wrote:
> Am 08.05.2018 um 17:24 schrieb Duy Nguyen:
>> On Mon, Apr 23, 2018 at 7:36 AM, Eric Sunshine
>> wrote:
>>> I haven't looked at the implementation, so this may be an entirely
>>> stupid suggestion, but would it be possible to instead render
On Wed, May 9, 2018 at 5:20 AM, Aaron Schrab wrote:
> At 17:24 +0200 08 May 2018, Duy Nguyen wrote:
>>
>> It took me so long to reply partly because I remember seeing some guy
>> doing clever trick with tab completion that also shows a short help
>> text in addition to the complete words. I could
Am 08.05.2018 um 17:24 schrieb Duy Nguyen:
> On Mon, Apr 23, 2018 at 7:36 AM, Eric Sunshine
> wrote:
>> I haven't looked at the implementation, so this may be an entirely
>> stupid suggestion, but would it be possible to instead render the
>> completions as?
>>
>> % git checkout --
>> --[
On Mon, May 14, 2018 at 5:33 AM, Eric Sunshine wrote:
> It _might_ feel as bit less weird if it was presented as --no-
> or --no-{...} or --no-<...> or --no-... or something, but those seem
> pretty weird too, so perhaps not. Anyhow, it's not a major issue; the
> --[no-]foo idea seems pretty intui
On Mon, May 14, 2018 at 04:52:29PM +0900, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
> > diff --git a/commit.h b/commit.h
> > index 838f6a6b26..70371e111e 100644
> > --- a/commit.h
> > +++ b/commit.h
> > @@ -18,12 +18,16 @@ struct commit_list {
> >
> > struct commit {
> > stru
What does ^M at the end of lines in the output of 'git diff' mean ?
Thanks,
Frank
On Mon, May 14, 2018 at 04:52:53PM +0200, Duy Nguyen wrote:
> On Sun, May 13, 2018 at 11:02 PM, Kevin Daudt wrote:
> > One data point indicating this is giving issues is that today on IRC a
> > user was confused why `git checkout pt` did not show any message and did
> > not checkout a remote branc
Здравствуйте, дорогой, мне нужен ваш срочный ответ. У меня есть
хорошая новость для вас.
Мишель
благодаря
On Sun, May 13, 2018 at 11:02 PM, Kevin Daudt wrote:
> One data point indicating this is giving issues is that today on IRC a
> user was confused why `git checkout pt` did not show any message and did
> not checkout a remote branch called 'pt' as they expected. It turned out
> they also had a loca
On Mon, May 14, 2018 at 09:25:46AM -0400, Derrick Stolee wrote:
> > I think you'd want to go the other way: this is marking uninteresting
> > commits, so you'd want origin/master..master, which would make those 70k
> > commits uninteresting.
>
> Thanks for the tip. Running 'git rev-list origin/ma
On 5/12/2018 5:17 PM, Martin Ågren wrote:
On 11 May 2018 at 23:15, Derrick Stolee wrote:
When running 'git commit-graph verify', compare the contents of the
commits that are loaded from the commit-graph file with commits that are
loaded directly from the object database. This includes checking
On 5/12/2018 9:35 AM, Martin Ågren wrote:
+static int verify_commit_graph_error;
+
+static void graph_report(const char *fmt, ...)
+{
+ va_list ap;
+ struct strbuf sb = STRBUF_INIT;
+ verify_commit_graph_error = 1;
+
+ va_start(ap, fmt);
+ strbuf_vaddf(&sb, fmt, ap);
Isten áldjon
Én vagyok Mrs.Johanna Tuuk, özvegy vagyok hosszú ideig tartó rákban. Az
állapotom minden jelzoje valóban romlik, és teljesen nyilvánvaló, hogy két
hónapot nem fogok élni orvosaim szerint, és minden jelzésben az orvosi elemzést
illetoen. Ez azért van, mert a rák nagyon rossz stádium
On 5/12/2018 9:31 AM, Martin Ågren wrote:
On 11 May 2018 at 23:15, Derrick Stolee wrote:
graph_name = get_commit_graph_filename(opts.obj_dir);
graph = load_commit_graph_one(graph_name);
+ FREE_AND_NULL(graph_name);
if (!graph)
die("graph file
On 5/14/2018 9:09 AM, Jeff King wrote:
On Mon, May 14, 2018 at 08:47:33AM -0400, Derrick Stolee wrote:
On 5/11/2018 2:03 PM, Jeff King wrote:
Commit 941ba8db57 (Eliminate recursion in setting/clearing
marks in commit list, 2012-01-14) used a clever double-loop
to avoid allocations for single-p
On 5/12/2018 10:00 AM, Jakub Narebski wrote:
Derrick Stolee writes:
On 5/4/2018 3:40 PM, Jakub Narebski wrote:
With early parts of commit-graph feature (ds/commit-graph and
ds/lazy-load-trees) close to being merged into "master", see
https://public-inbox.org/git/xmqq4ljtz87g@gitster-ct.c.g
On Mon, May 14, 2018 at 08:47:33AM -0400, Derrick Stolee wrote:
> On 5/11/2018 2:03 PM, Jeff King wrote:
> > Commit 941ba8db57 (Eliminate recursion in setting/clearing
> > marks in commit list, 2012-01-14) used a clever double-loop
> > to avoid allocations for single-parent chains of history.
> >
On 5/12/2018 4:04 AM, Eckhard Maaß wrote:
On Fri, May 11, 2018 at 12:56:39PM +, Ben Peart wrote:
After performing a merge that has conflicts git status will, by default,
attempt to detect renames which causes many objects to be examined. In a
virtualized repo, those objects do not exist l
On 5/11/2018 2:00 PM, Jeff King wrote:
This is a follow-up to the discussion from February:
https://public-inbox.org/git/1519522496-73090-1-git-send-email-dsto...@microsoft.com/
There I theorized that some of these extra has_object_file() checks were
unnecessary. After poking around a bit,
On 5/11/2018 2:03 PM, Jeff King wrote:
Commit 941ba8db57 (Eliminate recursion in setting/clearing
marks in commit list, 2012-01-14) used a clever double-loop
to avoid allocations for single-parent chains of history.
However, it did so only when following parents of parents
(which was an uncommon
git submodule commands can now access .gitmodules from the index when
it's not checked out in the work tree, add some tests for that scenario.
Signed-off-by: Antonio Ospite
---
t/t7415-submodule-sparse-gitmodules.sh | 124 +
1 file changed, 124 insertions(+)
create mode
When the .gitmodules file is not available in the working directory, try
using HEAD:.gitmodules from the index. This covers the case when the
file is part of the repository but for some reason it is not checked
out, for example because of a sparse checkout.
This makes it possible to use at least t
In t/t7506-status-submodule.sh at some point a new scenario is set up to
test different things, in particular new submodules are added which are
meant to completely replace the previous ones.
However the code just removes .gitmodules from the work tree, still
leaving it in the index.
This will br
The config_from_gitmodules() function is a good candidate for
a centralized point where to read the gitmodules configuration file.
Add a repo argument to it to make the function more general, and adjust
the current callers in cmd_fetch and update-clone.
As a proof of the utility of the change, st
Add a --stage option to the 'submodule--helper config' command so that
the .gitmodules file can be staged without referring to it explicitly by
file path.
In practice the config will still be written to .gitmoudules, there are
no plans to change the file path, but having this level of indirection
Use 'git submodule--helper config --stage' in git-submodule.sh to remove
the last place where the .gitmodules file is mentioned explicitly by its
file path.
Signed-off-by: Antonio Ospite
---
git-submodule.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-submodule.sh b/g
Use the 'submodule--helper config' command in git-modules.sh to avoid
referring explicitly to .gitmodules by the hardcoded file path.
This makes it possible to access the submodules configuration in a more
flexible way.
Signed-off-by: Antonio Ospite
---
git-submodule.sh | 8
1 file cha
Hi,
vcsh[1] uses bare git repositories and detached work-trees to manage
*distinct* sets of configuration files directly into $HOME.
In this setup multiple repositories share the same directory (namely
$HOME) as their work dir, so the sets of checked out files would also
need to be *disjoint* to
Tests 5 and 8 in t/t7411-submodule-config.sh add two commits with
invalid lines in .gitmodules but then only the second commit is removed.
This may affect subsequent tests if they assume that the .gitmodules
file has no errors.
Since those commits are not needed anymore remove both of them.
Sign
Add a new 'config' subcommand to 'submodule--helper', this extra level
of indirection makes it possible to add some flexibility to how the
submodules configuration is handled.
Signed-off-by: Antonio Ospite
---
builtin/submodule--helper.c | 39 +
t/t7411-submod
1 - 100 of 109 matches
Mail list logo
