[PATCH 013/194] sha1_file: add repository argument to sha1_loose_object_info

Add a repository argument to allow the sha1_loose_object_info caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH 018/194] pack: add repository argument to rearrange_packed_git

From: Jonathan Nieder Add a repository argument to allow the rearrange_packed_git caller to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As

[PATCH 010/194] sha1_file: add repository argument to stat_sha1_file

Add a repository argument to allow the stat_sha1_file caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 012/194] sha1_file: add repository argument to map_sha1_file_1

Add a repository argument to allow the map_sha1_file_1 caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 014/194] object-store: add repository argument to prepare_alt_odb

Add a repository argument to allow prepare_alt_odb callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers

[PATCH 017/194] pack: add repository argument to prepare_packed_git_one

From: Jonathan Nieder Add a repository argument to allow the prepare_packed_git_one caller to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As

[PATCH 016/194] pack: add repository argument to install_packed_git

From: Jonathan Nieder Add a repository argument to allow install_packed_git callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the

[PATCH 011/194] sha1_file: add repository argument to open_sha1_file

Add a repository argument to allow the open_sha1_file caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 019/194] pack: add repository argument to prepare_packed_git_mru

From: Jonathan Nieder Add a repository argument to allow the prepare_packed_git_mru caller to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As

[PATCH 020/194] pack: add repository argument to prepare_packed_git

From: Jonathan Nieder Add a repository argument to allow prepare_packed_git_mru callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Callers

[PATCH 008/194] sha1_file: add repository argument to read_info_alternates

Add a repository argument to allow the read_info_alternates caller to be more specific about which repository to read from. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commit, use a macro to

[PATCH 007/194] sha1_file: add repository argument to link_alt_odb_entry

Add a repository argument to allow the link_alt_odb_entry caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commit, use a macro to catch

[PATCH 009/194] sha1_file: add repository argument to link_alt_odb_entries

Add a repository argument to allow the link_alt_odb_entries caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 004/194] pack: move prepare_packed_git_run_once to object store

From: Jonathan Nieder Each repository's object store can be initialized independently, so they must not share a run_once variable. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 8 +++-

[PATCH 006/194] sha1_file: add repository argument to alt_odb_usable

Add a repository argument to allow the alt_odb_usable caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Since the implementation does not yet work with other

[PATCH 005/194] pack: move approximate object count to object store

From: Jonathan Nieder The approximate_object_count() function maintains a rough count of objects in a repository to estimate how long object name abbreviates should be. Object names are scoped to a repository and the appropriate length may differ by repository, so the object

[RFC PATCH 000/194] Moving global state into the repository object

This series moves a lot of global state into the repository struct. It applies on top of 2512f15446149235156528dafbe75930c712b29e (2.16.0) It can be found at https://github.com/stefanbeller/git/tree/object-store Motivation for this series: * Easier to reason about code when all state is stored in

[PATCH 002/194] object-store: move alt_odb_list and alt_odb_tail to object store

In a process with multiple repositories open, alternates should be associated to a single repository and not shared globally. Move alt_odb_list and alt_odb_tail into the_repository and adjust callers to reflect this. No functional change intended. Signed-off-by: Stefan Beller

[PATCH 003/194] object-store: move packed_git and packed_git_mru to object store

From: Jonathan Nieder In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. Patch generated by 1.

[PATCH 001/194] repository: introduce object store field

The object store field will contain any objects needed for access to objects in a given repository. This patch introduces the object store but for now it is empty. C99 forbids empty structs, but common C compilers cope well with them and this struct will gain members very soon (starting with the

[RFH/PATCH] blame: tighten command line parser

The command line parser of "git blame" is prepared to take an ancient odd argument order "blame " in addition to the usual "blame [] ". It has at least two negative ramifications: - In order to tell these two apart, it checks if the last command line argument names a path in the working

Re: [PATCH v7 28/31] merge-recursive: fix remaining directory rename + dirty overwrite cases

On Mon, Feb 5, 2018 at 1:52 PM, Stefan Beller wrote: > On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: >> + /* >> +* Stupid double negatives in remove_file; it somehow manages >> +* to repeatedly mess me

Re: cherry-pick '-m' curiosity

On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov wrote: > Hello, > > $ git help cherry-pick > > -m parent-number, --mainline parent-number >Usually you cannot cherry-pick a merge because you do not >know which side of the merge should be considered the >

Re: [PATCH v7 31/31] merge-recursive: ensure we write updates for directory-renamed file

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > When a file is present in HEAD before the merge and the other side of the > merge does not modify that file, we try to avoid re-writing the file and > making it stat-dirty. However, when a file is present in HEAD before

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

On 02/05, Ben Peart wrote: > The untracked cache saves its current state in the UNTR index extension. > Currently, _any_ change to that state causes the index to be flagged as dirty > and written out to disk. Unfortunately, the cost to write out the index can > exceed the savings gained by using

Re: [PATCH v7 28/31] merge-recursive: fix remaining directory rename + dirty overwrite cases

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > Signed-off-by: Elijah Newren > --- > merge-recursive.c | 26 +++--- > t/t6043-merge-rename-directories.sh | 8 > 2 files changed, 27 insertions(+), 7

Re: [GSoC][PATCH] commit: add a commit.signOff config variable

On Sat, Feb 3, 2018 at 6:03 PM, Chen Jingpiao wrote: > Add the commit.signOff configuration variable to use the -s or --signoff > option of git commit by default. > > Signed-off-by: Chen Jingpiao > --- Welcome to the Git community! > > Though we

Re: [PATCH v7 17/31] merge-recursive: add a new hashmap for storing directory renames

On Mon, Feb 5, 2018 at 11:44 AM, Stefan Beller wrote: >>> Having a stringlist of potentially new dirs sounds like the algorithm is >>> at least n^2, but how do I know? I'll read on. >> >> Yes, I suppose it's technically n^2, but n is expected to be O(1). >> While one can

Re: [PATCH v7 27/31] merge-recursive: fix overwriting dirty files involved in renames

On Mon, Feb 5, 2018 at 12:52 PM, Stefan Beller wrote: > On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: >> This fixes an issue that existed before my directory rename detection >> patches that affects both normal renames and renames implied by >>

Re: [PATCH RFC v2 14/25] ref-filter: add is_cat flag

Olga Telezhnaya writes: > diff --git a/ref-filter.c b/ref-filter.c > index 34a54db168265..91290b62450b3 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -101,6 +101,7 @@ static struct used_atom { > } *used_atom; > static int used_atom_cnt, need_tagged,

Re: [PATCH v7 20/31] merge-recursive: check for directory level conflicts

On Mon, Feb 5, 2018 at 12:00 PM, Stefan Beller wrote: > On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: >> Before trying to apply directory renames to paths within the given >> directories, we want to make sure that there aren't conflicts at the >>

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

On 2/1/2018 8:35 PM, SZEDER Gábor wrote: It is possible to have multiple commit graph files in a pack directory, but only one is important at a time. Use a 'graph_head' file to point to the important file. This implies that all those other files are ignored, right? Yes. We do not use

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

Ben Peart writes: > The untracked cache saves its current state in the UNTR index extension. > Currently, _any_ change to that state causes the index to be flagged as dirty > and written out to disk. Unfortunately, the cost to write out the index can > exceed the savings

Re: [PATCH v7 27/31] merge-recursive: fix overwriting dirty files involved in renames

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > This fixes an issue that existed before my directory rename detection > patches that affects both normal renames and renames implied by > directory rename detection. Additional codepaths that only affect > overwriting of

Re: git: CVE-2018-1000021: client prints server sent ANSI escape codes to the terminal, allowing for unverified messages to potentially execute arbitrary commands

+cc: upstream Hi, Salvatore Bonaccorso wrote[1]: > the following vulnerability was published for git. > > CVE-2018-121[0]: > |client prints server sent ANSI escape codes to the terminal, allowing > |for unverified messages to potentially execute arbitrary commands > > Creating this bug to

Re: [PATCH v2 3/3] worktree: teach "add" to check out existing branches

On 02/05, Duy Nguyen wrote: > On Sun, Feb 04, 2018 at 10:13:05PM +, Thomas Gummerer wrote: > > - if (opts->new_branch) > > + if (opts->checkout_existing_branch) > > + fprintf(stderr, _(", checking out existing branch '%s'"), > > + refname); > > + else if

Re: [PATCH v2 3/3] worktree: teach "add" to check out existing branches

Duy Nguyen writes: > On Sun, Feb 04, 2018 at 10:13:05PM +, Thomas Gummerer wrote: >> -if (opts->new_branch) >> +if (opts->checkout_existing_branch) >> +fprintf(stderr, _(", checking out existing branch '%s'"), >> +refname); >> +

Are concurrent git operations on the same repo safe?

Hi all, I'm generally used to the idea that if a thing is not marked as "thread-safe" then it isn't thread safe, but I thought I'd ask anyway to be sure. Is it safe for me to do several operations with git concurrently on the same local repo? Specifically I'm trying to speed up "git submodule

Re: [PATCH v2 1/3] worktree: improve message when creating a new worktree

Duy Nguyen writes: > On Sun, Feb 04, 2018 at 10:13:03PM +, Thomas Gummerer wrote: >> diff --git a/builtin/worktree.c b/builtin/worktree.c >> index 7cef5b120b..d1549e441d 100644 >> --- a/builtin/worktree.c >> +++ b/builtin/worktree.c >> @@ -303,7 +303,7 @@ static int

Re: [PATCH v2 1/3] worktree: improve message when creating a new worktree

On 02/05, Duy Nguyen wrote: > On Sun, Feb 04, 2018 at 10:13:03PM +, Thomas Gummerer wrote: > > diff --git a/builtin/worktree.c b/builtin/worktree.c > > index 7cef5b120b..d1549e441d 100644 > > --- a/builtin/worktree.c > > +++ b/builtin/worktree.c > > @@ -303,7 +303,7 @@ static int

Re: Missing git options

On Mon, Feb 05 2018, Martin Häcker jotted: > Hi there, > > I just recently learned that not all command line switches seem to > automatically correlate to options in the git configuration. > > This seems something that should be relatively easy to fix. > > What I’m most missing is > > — snip —

Re: [PATCH v4] daemon: add --log-destination=(stderr|syslog|none)

On Sun, Feb 04 2018, Lucas Werkmeister jotted: > On 04.02.2018 19:55, Ævar Arnfjörð Bjarmason wrote: >> >> On Sun, Feb 04 2018, Lucas Werkmeister jotted: >> >>> [--inetd | >>> [--listen=] [--port=] >>> [--user= [--group=]]] >>> +

Re: [PATCH v7 21/31] merge-recursive: add a new hashmap for storing file collisions

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > Directory renames with the ability to merge directories opens up the > possibility of add/add/add/.../add conflicts, if each of the N > directories being merged into one target directory all had a file with > the same name.

Re: [PATCH v7 17/31] merge-recursive: add a new hashmap for storing directory renames

Johannes Sixt writes: > Am 03.02.2018 um 22:34 schrieb Elijah Newren: >> If anyone can find an >> example of a real world open source repository (linux, webkit, git, >> etc.) with a merge where n is greater than about 10, I'll be >> surprised. > > git rev-list --parents --merges

Re: [PATCH v7 20/31] merge-recursive: check for directory level conflicts

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > Before trying to apply directory renames to paths within the given > directories, we want to make sure that there aren't conflicts at the > directory level. There will be additional checks at the individual > file level

[PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

The untracked cache saves its current state in the UNTR index extension. Currently, _any_ change to that state causes the index to be flagged as dirty and written out to disk. Unfortunately, the cost to write out the index can exceed the savings gained by using the untracked cache. Since it is a

Re: cherry-pick '-m' curiosity

Sergey Organov writes: > Isn't it always the case that "mainline" is the first parent, as that's > how "git merge" happens to work? You may not be merging into the "mainline" in the first place. Imagine forking two topics at the same commit on the mainline, and merging

Re: [PATCH v7 17/31] merge-recursive: add a new hashmap for storing directory renames

>> Having a stringlist of potentially new dirs sounds like the algorithm is >> at least n^2, but how do I know? I'll read on. > > Yes, I suppose it's technically n^2, but n is expected to be O(1). > While one can trivially construct a case making n arbitrarily large, > statistically for real world

Re: Missing git options

Stefan Beller writes: > I had the impression that git-log was a pseudo-plumbing, > despite it being explicitly marked porcelain > as there is no good plumbing alternative. I do not think that is a fair assessment of the situation. The more troublesome is that depending on

Re: [PATCH v7 19/31] merge-recursive: add get_directory_renames()

> /* > * For > *"a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c" > * the "e/foo.c" part is the same, we just want to know that > *"a/b/c/d" was renamed to "a/b/some/thing/else" > * so, for this example, this function returns "a/b/c/d" in > * *old_dir and

[bug report]: error doing_rebase

Hi. To reproduce: git init testrepo cd testrepo echo 1 >> file git add file git commit -m'1' echo 2 >> file git add file git commit -m'2' echo 3 >> file git add file git commit -m'3' Now there are 3 sequential commits, I want to squash them into 1: git rebase -i HEAD~2 In editor I

Re: [PATCH v2 06/14] commit-graph: implement git-commit-graph --read

On 2/1/2018 7:23 PM, Jonathan Tan wrote: On Tue, 30 Jan 2018 16:39:35 -0500 Derrick Stolee wrote: Teach git-commit-graph to read commit graph files and summarize their contents. One overall question - is the "read" command meant to be a command used by the end user, or is

Re: [GSoC][PATCH v2] commit: add a commit.signOff config variable

Chen Jingpiao writes: > Add the commit.signOff configuration variable to use the -s or --signoff > option of git commit by default. This is a rather old topic. Here is one from 2006:

Re: [PATCH v7 12/31] merge-recursive: move the get_renames() function

> Move this function so it can re-use some others (without either > moving all of them or adding an annoying split between function > declarations and definitions). Cheat slightly by adding a blank line > for readability, and in order to silence checkpatch.pl. > > Does that sound better? Yeah,

Re: [PATCH v3 0/2] diff: add --stat-with-summary (was --compact-summary)

Duy Nguyen writes: > On Sat, Feb 3, 2018 at 2:59 AM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> Changes since v2 [1]: >>> >>> - goes back to my original version (yay!) where the extra info >>> is appended after the

Re: Missing git options

On Mon, Feb 5, 2018 at 1:12 AM, Martin Häcker wrote: > Hi there, > > I just recently learned that not all command line switches seem to > automatically correlate to options in the git configuration. > > This seems something that should be relatively easy to fix. > >

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

Jeff King writes: > The big advantage of your scheme is that you can update the graph index > without repacking. The traditional advice has been that you should > always do a full repack during a gc (since it gives the most delta > opportunities). So metadata like reachability

Re: Bug Report: Subtrees and GPG Signed Commits

Stephen R Guglielmo writes: > diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh > index cc033af73..dec085a23 100755 > --- a/contrib/subtree/git-subtree.sh > +++ b/contrib/subtree/git-subtree.sh > @@ -475,7 +475,7 @@ squash_msg () { > >

HI

Greeting please is me Elisabeth, i send you message few days ago till now i have not hear from you, please did you receive this one?

Re: [PATCH v4] daemon: add --log-destination=(stderr|syslog|none)

Eric Sunshine writes: > On Sun, Feb 4, 2018 at 1:30 PM, Lucas Werkmeister > wrote: >> This new option can be used to override the implicit --syslog of >> ... > Thanks. With the 'log_destination' initialization bug fixed, this > version looks

Re: git: handling HTTPS proxy w/ password inappropriately

2018-02-06 1:55 GMT+08:00 Jonathan Nieder : > Hi, > > Yangfl wrote[1]: > >> not affected any more > > Can you say a little more about this? Do you mean that newer versions > of Git are working better for you or that your proxy setup changed? > > This looks

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

On 2/1/2018 6:48 PM, SZEDER Gábor wrote: Teach git-commit-graph to write graph files. Create new test script to verify this command succeeds without failure. Signed-off-by: Derrick Stolee --- Documentation/git-commit-graph.txt | 18 +++ builtin/commit-graph.c

Re: git: handling HTTPS proxy w/ password inappropriately

Hi, Yangfl wrote[1]: > not affected any more Can you say a little more about this? Do you mean that newer versions of Git are working better for you or that your proxy setup changed? This looks similar to

Re: [PATCH] dir.c: ignore paths containing .git when invalidating untracked cache

On 2/4/2018 4:38 AM, Nguyễn Thái Ngọc Duy wrote: read_directory() code ignores all paths named ".git" even if it's not a valid git repository. See treat_path() for details. Since ".git" is basically invisible to read_directory(), when we are asked to invalidate a path that contains ".git", we

Hello My Dear Friend,

I have a business proposal in the tune of $10.2 Million USD for you to handle with me. I have opportunity to transfer this abandon fund to your bank account in your country which belongs to our client. I am inviting you in this transaction where this money can be shared between us at ratio

Re: [PATCH v2 04/14] commit-graph: implement construct_commit_graph()

On 2/2/2018 10:32 AM, SZEDER Gábor wrote: Teach Git to write a commit graph file by checking all packed objects to see if they are commits, then store the file in the given pack directory. I'm afraid that scanning all packed objects is a bit of a roundabout way to approach this. In my git

Re: [PATCH v7 17/31] merge-recursive: add a new hashmap for storing directory renames

// Re-sending because of bounce On Sun, Feb 4, 2018 at 12:54 AM, Johannes Sixt wrote: > Am 03.02.2018 um 22:34 schrieb Elijah Newren: >> If anyone can find an >> example of a real world open source repository (linux, webkit, git, >> etc.) with a merge where n is greater than

Re: Bug Report: Subtrees and GPG Signed Commits

On Mon, Feb 5, 2018 at 9:30 AM, Stephen R Guglielmo wrote: > On Wed, Jan 31, 2018 at 7:33 AM, Stephen R Guglielmo > wrote: >> On Tue, Jan 30, 2018 at 6:37 PM, Avery Pennarun wrote: >>> On Tue, Jan 30, 2018 at 6:24 PM, Junio C

Re: Bug Report: Subtrees and GPG Signed Commits

On Wed, Jan 31, 2018 at 7:33 AM, Stephen R Guglielmo wrote: > On Tue, Jan 30, 2018 at 6:37 PM, Avery Pennarun wrote: >> On Tue, Jan 30, 2018 at 6:24 PM, Junio C Hamano wrote: >>> Stefan Beller writes: There

Re: [PATCH v2 10/27] protocol: introduce enum protocol_version value protocol_v2

On 2/2/2018 5:44 PM, Brandon Williams wrote: On 01/31, Derrick Stolee wrote: On 1/25/2018 6:58 PM, Brandon Williams wrote: Introduce protocol_v2, a new value for 'enum protocol_version'. Subsequent patches will fill in the implementation of protocol_v2. Signed-off-by: Brandon Williams

Re: Bug? Error during commit

On Mon, Feb 5, 2018 at 8:48 PM, Andreas Kalz wrote: > Hello, > > I am using git frequently and usually it is running great. > > I read to write to this eMail address regarding problems and possible bugs. > I am using git version 2.16.1.windows.2 / 64 Bit and during commit the

Bug? Error during commit

Hello,   I am using git frequently and usually it is running great.   I read to write to this eMail address regarding problems and possible bugs. I am using git version 2.16.1.windows.2 / 64 Bit and during commit the following error message comes up: e:\Internet>git commit -m 2018-01-27 fatal:

Re: [PATCH 3/7] worktree move: new command

On Fri, Feb 2, 2018 at 6:23 PM, Eric Sunshine wrote: > On Fri, Feb 2, 2018 at 4:15 AM, Eric Sunshine wrote: >> On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy >> wrote: >>> +static int move_worktree(int ac, const char

cherry-pick '-m' curiosity

Hello, $ git help cherry-pick -m parent-number, --mainline parent-number Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. Isn't it always the case that "mainline" is the first parent, as

Re: [PATCH v3 0/2] diff: add --stat-with-summary (was --compact-summary)

On Sat, Feb 3, 2018 at 2:59 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> Changes since v2 [1]: >> >> - goes back to my original version (yay!) where the extra info >> is appended after the path name. More is described in 2/2 >> -

[PATCH RFC v2 17/25] ref-filter: make cat_file_info independent

Remove connection between expand_data variable in cat-file and in ref-filter. It will help further to get rid of using expand_data in cat-file. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH RFC v2 14/25] ref-filter: add is_cat flag

Add is_cat flag, further it helps to get rid of cat_file_data field in ref_format. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 1 + ref-filter.c | 8

[PATCH RFC v2 09/25] cat-file: start use ref_array_item struct

Moving from using expand_data to ref_array_item structure. That helps us to reuse functions from ref-filter easier. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c |

[PATCH RFC v2 23/25] for-each-ref: tests for new atoms added

Add tests for new formatting atoms: rest, deltabase, objectsize:disk. rest means nothing and we expand it into empty string. We need this atom for cat-file command. Have plans to support deltabase and objectsize:disk further (as it is done in cat-file), now also expand it to empty string.

[PATCH RFC v2 07/25] cat-file: start migrating formatting to ref-filter

Move mark_atom_in_object_info() from cat-file to ref-filter and start using it in verify_ref_format(). It also means that we start reusing verify_ref_format() in cat-file. Start from simple moving of mark_atom_in_object_info(), it would be removed later by integrating all needed processes into

[PATCH RFC v2 21/25] ref-filter: unifying formatting of cat-file opts

cat-file options are now filled by general logic. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 31 ++- 1 file changed, 14 insertions(+),

[PATCH RFC v2 20/25] ref-filter: make populate_value() internal again

Remove populate_value() from header file. We needed that for interim step, now it could be returned back. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 2 +-

[PATCH RFC v2 04/25] ref-filter: make valid_atom as function parameter

Make valid_atom as a function parameter, there could be another variable further. Need that for further reusing of formatting logic in cat-file.c. We do not need to allow users to pass their own valid_atom variable in global functions like verify_ref_format() because in the end we want to have

[PATCH RFC v2 15/25] ref_filter: add is_atom_used function

Delete all items related to split_on_whitespace from ref-filter and add new function for handling the logic. Now cat-file could invoke that function to implementing its logic. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC v2 19/25] cat-file: reuse printing logic from ref-filter

Reuse code from ref-filter to print resulting message. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 51 ---

[PATCH RFC v2 18/25] ref-filter: make valid_atom general again

Stop using valid_cat_file_atom, making the code more general. Further commits will contain some tests, docs and support of new features. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King ---

[PATCH RFC v2 25/25] cat-file: update of docs

Update the docs for cat-file command. Some new formatting atoms added because of reusing ref-filter code. We do not support cat-file atoms in general formatting logic (there is just the support for cat-file), that is why some of the atoms are still explained in cat-file docs. We need to move these

[PATCH RFC v2 10/25] ref-filter: make populate_value() global

Make function global for further using in cat-file. In the end of patch series this function becomes internal again, so this is a part of middle step. cat-file would use more general functions further. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC v2 12/25] cat-file: start reusing populate_value()

Move logic related to getting object info from cat-file to ref-filter. It will help to reuse whole formatting logic from ref-filter further. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH RFC v2 03/25] cat-file: reuse struct ref_format

Start using ref_format struct instead of simple char*. Need that for further reusing of formatting logic from ref-filter. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King ---

[PATCH RFC v2 02/25] ref-filter: add return value to some functions

Add return flag to format_ref_array_item(), show_ref_array_item(), get_ref_array_info() and populate_value() for further using. Need it to handle situations when item is broken but we can not invoke die() because we are in batch mode and all items need to be processed. Signed-off-by: Olga

[PATCH RFC v2 24/25] cat-file: tests for new atoms added

Add some tests for new formatting atoms from ref-filter. Some of new atoms are supported automatically, some of them are expanded into empty string (because they are useless for some types of objects), some of them could be supported later in other patches. Signed-off-by: Olga Telezhnaia

[PATCH RFC v2 01/25] ref-filter: get rid of goto

Get rid of goto command in ref-filter for better readability. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 9 + 1 file changed, 5 insertions(+), 4

[PATCH RFC v2 06/25] cat-file: split expand_atom() into 2 functions

Split expand_atom() into 2 different functions, mark_atom_in_object_info() prepares variable for further filling, (new) expand_atom() creates resulting string. Need that for further reusing of formatting logic from ref-filter. Both functions will be step-by-step removed by the end of this patch.

[PATCH RFC v2 13/25] ref-filter: get rid of mark_atom_in_object_info()

Remove mark_atom_in_object_info() and create same logic in terms of ref-filter style. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 45

[PATCH RFC v2 11/25] ref-filter: rename field in ref_array_item stuct

Rename objectname field to oid in struct ref_array_item. Next commit will add objectname field that will contain string representation of object id. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH RFC v2 16/25] cat-file: move skip_object_info into ref-filter

Move logic related to skip_object_info into ref-filter, so that cat-file does not use that field at all. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 7 +--

[PATCH RFC v2 22/25] ref-filter: work with objectsize:disk

Make a temporary solution for commands that could use objectsize:disk atom. It's better to fill it with value or give an error if there is no value for this atom, but as a first solution we do dothing. It means that if objectsize:disk is used, we put an empty string there. Signed-off-by: Olga

[PATCH RFC v2 05/25] cat-file: move struct expand_data into ref-filter

Need that for further reusing of formatting logic in cat-file. Have plans to get rid of using expand_data in cat-file at all, and use it only in ref-filter for collecting, formatting and printing needed data. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC v2 08/25] ref-filter: reuse parse_ref_filter_atom()

Continue migrating formatting logic from cat-file to ref-filter. Reuse parse_ref_filter_atom() for unifying all processes in ref-filter and further removing of mark_atom_in_object_info(). Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

<    1   2   3   4   >