Re: [RFC PATCH 00/10] Make submodules work if .gitmodules is not checked out

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

Re: [PATCH RFC] ref-filter: start using oid_object_info

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

Re: [PATCH RFC] ref-filter: start using oid_object_info

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

Re: [RFC PATCH 09/10] submodule: support reading .gitmodules even when it's not checked out

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

Re: [PATCH v1 2/8] Add initial odb remote support

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

Re: [RFC PATCH 04/10] submodule--helper: add a new 'config' subcommand

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

Re: [PATCH v1 1/8] fetch-object: make functions return an error code

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 +-- >

Re: [PATCH 2/2] merge-recursive: i18n submodule merge output and respect verbosity

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

Re: [RFC PATCH 03/10] t7411: be nicer to other tests and really clean things up

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

Re: [RFC PATCH 02/10] submodule: factor out a config_gitmodules_set function

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

Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge

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)) { >

Re: [RFC PATCH 00/10] Make submodules work if .gitmodules is not checked out

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.

Re: [RFC PATCH 01/10] config: make config_from_gitmodules generally useful

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

[PATCH] grep: handle corrupt index files early

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

Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge

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

Re: [PATCH 00/35] refactoring refspecs

> 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

Re: could `git merge --no-ff origin/master` be made more useful?

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

could `git merge --no-ff origin/master` be made more useful?

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

[PATCH 13/35] remote: convert push refspecs to struct refspec

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

[PATCH 10/35] remote: convert match_push_refs to use struct refspec

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

[PATCH 11/35] clone: convert cmd_clone to use refspec_item_init

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

[PATCH 20/35] fetch: convert get_ref_map to take a struct refspec

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

[PATCH 16/35] fetch: convert fetch_one to use struct refspec

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

[PATCH 12/35] fast-export: convert to use struct refspec

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

[PATCH 30/35] send-pack: store refspecs in a struct refspec

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

[PATCH 28/35] push: convert to use struct refspec

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

[PATCH 29/35] transport: convert transport_push to take a struct refspec

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

[PATCH 23/35] remote: convert apply_refspecs to take a struct refspec

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

[PATCH 21/35] fetch: convert prune_refs to take a struct refspec

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

[PATCH 34/35] remote: convert check_push_refs to take a struct refspec

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

[PATCH 35/35] submodule: convert push_unpushed_submodules to take a struct refspec

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

[PATCH 31/35] transport: remove transport_verify_remote_names

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

[PATCH 33/35] remote: convert match_push_refs to take a struct refspec

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

[PATCH 32/35] http-push: store refspecs in a struct refspec

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

[PATCH 24/35] remote: convert query_refspecs to take a struct refspec

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

[PATCH 27/35] push: check for errors earlier

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

[PATCH 26/35] remote: convert match_explicit_refs to take a struct refspec

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

[PATCH 25/35] remote: convert get_ref_match to take a struct refspec

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

[PATCH 22/35] remote: convert get_stale_heads to take a struct refspec

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

[PATCH 19/35] fetch: convert do_fetch to take a struct refspec

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

[PATCH 18/35] refspec: remove the deprecated functions

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

[PATCH 15/35] transport-helper: convert to use struct refspec

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

[PATCH 17/35] fetch: convert refmap to use struct refspec

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

[PATCH 14/35] remote: convert fetch refspecs to struct refspec

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

[PATCH 08/35] transport: convert transport_push to use struct refspec

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

[PATCH 09/35] remote: convert check_push_refs to use struct refspec

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

[PATCH 05/35] refspec: convert valid_fetch_refspec to use parse_refspec

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(-)

[PATCH 07/35] pull: convert get_tracking_branch to use refspec_item_init

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

[PATCH 04/35] refspec: introduce struct refspec

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

[PATCH 01/35] refspec: move refspec parsing logic into its own file

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 +

[PATCH 06/35] submodule--helper: convert push_check to use struct refspec

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

[PATCH 02/35] refspec: factor out parsing a single refspec

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

[PATCH 03/35] refspec: rename struct refspec to struct refspec_item

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

[PATCH 00/35] refactoring refspecs

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

Re: [RFC] Other chunks for commit-graph, part 1 - Bloom filters, topo order, etc.

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

[PATCH 1/1] Inform about fast-forwarding of submodules during merge

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

[PATCH 0/1] rebased: inform about auto submodule ff during merge

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

Re: Git push error due to hooks error

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

Re: [PATCH/RFC] completion: complete all possible -no-

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

[PATCH] commit: fix sparse 'not declared' warning

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,

[GSoC] Week 2 - 'git stash' blog

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

Re: [PATCH] doc: fix config API documentation about config_with_options

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

Re: [RFC PATCH 01/10] config: make config_from_gitmodules generally useful

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. >

Re: [PATCH v2 14/14] commit.h: delete 'util' field in struct commit

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

Re: git diff: meaning of ^M at line ends ?

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

Git push error due to hooks error

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

Re: [PATCH] t7005-editor: get rid of the SPACES_IN_FILENAMES prereq

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

Re: Git push error due to hooks error

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

Git push error due to hooks error

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

Re: [PATCH v2 14/14] commit.h: delete 'util' field in struct commit

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 >> >

Re: [PATCH/RFC] completion: complete all possible -no-

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

Re: [PATCH/RFC] completion: complete all possible -no-

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

Re: [PATCH/RFC] completion: complete all possible -no-

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? >> >> %

Re: [PATCH/RFC] completion: complete all possible -no-

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 >

Re: [PATCH v2 14/14] commit.h: delete 'util' field in struct commit

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

git diff: meaning of ^M at line ends ?

What does ^M at the end of lines in the output of 'git diff' mean ? Thanks, Frank

Re: [PATCH 1/3] checkout.c: add strict usage of -- before file_path

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

благодаря

Здравствуйте, дорогой, мне нужен ваш срочный ответ. У меня есть хорошая новость для вас. Мишель благодаря

Re: [PATCH 1/3] checkout.c: add strict usage of -- before file_path

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 >

Re: [PATCH 4/4] mark_parents_uninteresting(): avoid most allocation

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

Re: [PATCH v2 08/12] commit-graph: verify commit contents against odb

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.

Re: [PATCH v2 02/12] commit-graph: verify file header information

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(, fmt, ap); +

Isten áldjon

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

Re: [PATCH v2 01/12] commit-graph: add 'verify' subcommand

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)

Re: [PATCH 4/4] mark_parents_uninteresting(): avoid most allocation

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

Re: [RFC] Other chunks for commit-graph, part 1 - Bloom filters, topo order, etc.

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

Re: [PATCH v3] add status config and command line options for rename detection

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

Re: [PATCH 0/4] a few mark_parents_uninteresting cleanups

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,

Re: [PATCH 4/4] mark_parents_uninteresting(): avoid most allocation

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

[RFC PATCH 10/10] t7415: add new test about using HEAD:.gitmodules from the index

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(+)

[RFC PATCH 09/10] submodule: support reading .gitmodules even when it's not checked out

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

[RFC PATCH 08/10] t7506: cleanup .gitmodules properly before setting up new scenario

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

[RFC PATCH 01/10] config: make config_from_gitmodules generally useful

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,

[RFC PATCH 06/10] submodule--helper: add a '--stage' option to the 'config' sub command

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

[RFC PATCH 07/10] submodule: use 'submodule--helper config --stage' to stage .gitmodules

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

[RFC PATCH 05/10] submodule: use the 'submodule--helper config' command

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

[RFC PATCH 00/10] Make submodules work if .gitmodules is not checked out

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

[RFC PATCH 03/10] t7411: be nicer to other tests and really clean things up

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.

[RFC PATCH 04/10] submodule--helper: add a new 'config' subcommand

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 +

[RFC PATCH 02/10] submodule: factor out a config_gitmodules_set function

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 of using "git config -f .gitmodules". Signed-off-by: Antonio

  1   2   >