Re: [PATCH v2 2/6] grep.c: take column number as argument to show_line()

On Mon, Apr 23 2018, Eric Sunshine wrote: > On Sun, Apr 22, 2018 at 9:17 PM, Taylor Blau wrote: > One important issue I noticed is that patch 3/7 neglects to update > grep.c:init_grep_defaults() to initialize opt.color_columnno. I think this is fine for fields that are 0 by

Re: [PATCH v2 2/6] grep.c: take column number as argument to show_line()

On Mon, Apr 23, 2018 at 3:27 AM, Ævar Arnfjörð Bjarmason wrote: > On Mon, Apr 23 2018, Eric Sunshine wrote: >> One important issue I noticed is that patch 3/7 neglects to update >> grep.c:init_grep_defaults() to initialize opt.color_columnno. > > I think this is fine for fields

Re: [PATCH v3 6/6] help: use command-list.txt for the source of guides

On Sat, Apr 21, 2018 at 12:54 PM, Nguyễn Thái Ngọc Duy wrote: > The help command currently hard codes the list of guides and their > summary in C. Let's move this list to command-list.txt. This lets us > extract summary lines from Documentation/git*.txt. This also > potentially

Re: [PATCH v2 3/6] generate-cmdlist.sh: keep all information in common-cmds.h

Junio C Hamano writes: > Nguyễn Thái Ngọc Duy writes: > > > +category_list () { > > + command_list "$1" | awk '{print $2;}' | sort | uniq > > +} > > Piping output of awk to sort/uniq, instead of processing all inside > awk within the END block of the

Re: [PATCH v2 2/6] grep.c: take column number as argument to show_line()

On Mon, Apr 23 2018, Taylor Blau wrote: > For your consideration: https://github.com/ttaylorr/git/compare/tb/grep-colno Looks good to me aside from two minor issues I noticed: * In "grep.c: display column number of first match" you use a comment style we don't normally use, i.e. /**\n not

Re: [PATCH v2 3/6] generate-cmdlist.sh: keep all information in common-cmds.h

> Junio C Hamano writes: > > > Nguyễn Thái Ngọc Duy writes: > > > > > +category_list () { > > > + command_list "$1" | awk '{print $2;}' | sort | uniq > > > +} > > > > Piping output of awk to sort/uniq, instead of processing all inside > > awk within the

Re: Fw: New Defects reported by Coverity Scan for git [argv_array: offer to split a string by whitespace]

Hi Philip, On Sun, 22 Apr 2018, Philip Oakley wrote: > is this part of your series "argv_array: offer to split a string by > whitespace"? > > https://public-inbox.org/git/capig+ctdbttuefymkntm773ebge14tpic4g4xefusvwsypd...@mail.gmail.com/ > > - Original Message - From:

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Phillip, On Sun, 22 Apr 2018, Phillip Wood wrote: > On 21/04/18 16:56, Phillip Wood wrote: > > On 21/04/18 11:33, Johannes Schindelin wrote: > >> This patch is part of the effort to reimplement `--preserve-merges` with > >> a substantially improved design, a design that has been developed in

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/20/2018 1:26 PM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 10:02 AM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -37,6 +37,11 @@

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/22/2018 8:07 AM, Eckhard Maaß wrote: On Fri, Apr 20, 2018 at 11:34:25AM -0700, Elijah Newren wrote: Sorry, I think I wasn't being clear. The documentation for the config options for e.g. diff.renameLimit, fetch.prune, log.abbrevCommit, and merge.ff all mention the equivalent command

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/20/2018 2:34 PM, Elijah Newren wrote: Hi Ben, On Fri, Apr 20, 2018 at 10:59 AM, Ben Peart wrote: On 4/20/2018 1:02 PM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: --- a/Documentation/merge-config.txt +++

Re: [PATCH v3 4/6] git.c: implement --list-cmds=porcelain

On Sat, Apr 21, 2018 at 6:54 PM, Nguyễn Thái Ngọc Duy wrote: > This is useful for git-completion.bash because it needs this set of > commands. Right now we have to maintain a separate command category in > there. I don't really understand this paragraph, in particular its

Re: Silly "git gc" UI issue.

Christian Couder writes: > On Sat, Apr 21, 2018 at 5:13 AM, Junio C Hamano wrote: > >> @@ -388,6 +389,9 @@ int cmd_gc(int argc, const char **argv, const char >> *prefix) >> if (argc > 0) >>

Re: [PATCH v3 2/6] git.c: implement --list-cmds=all and use it in git-completion.bash

On Sat, Apr 21, 2018 at 6:54 PM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy Oh, look, an empty commit message! :) So what does this option do and why use it in the completion script?

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Phillip, On Sat, 21 Apr 2018, Phillip Wood wrote: > On 21/04/18 11:33, Johannes Schindelin wrote: > > This patch is part of the effort to reimplement `--preserve-merges` with > > a substantially improved design, a design that has been developed in the > > Git for Windows project to maintain

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Philip, On Sun, 22 Apr 2018, Philip Oakley wrote: > From: "Johannes Schindelin" > > This patch is part of the effort to reimplement `--preserve-merges` with > > a substantially improved design, a design that has been developed in the > > Git for Windows project to

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

Taylor Blau writes: > For now, the Message-ID that I was referring to is: > 20180410001826.GB67209@syl.local. [1] Thanks.

Re: [PATCH v1 0/5] Allocate cache entries from memory pool

On 04/17/2018 02:39 PM, Ben Peart wrote: On 4/17/2018 12:34 PM, Jameson Miller wrote: 100K Test   baseline [4] block_allocation 0002.1: read_cache/discard_cache 1 times 

Hi

I am Flordevilla Pingkian,Please reconfirm this massage and get back to me.via (flord_p...@usa.com) Regards segt Flordevilla

Re: [PATCH v3 6/9] commit: use generation numbers for in_merge_bases()

On 4/18/2018 6:15 PM, Jakub Narebski wrote: Derrick Stolee writes: The containment algorithm for 'git branch --contains' is different from that for 'git tag --contains' in that it uses is_descendant_of() instead of contains_tag_algo(). The expensive portion of the

Re: [PATCH v3 7/9] commit: add short-circuit to paint_down_to_common()

On 4/18/2018 7:19 PM, Jakub Narebski wrote: Derrick Stolee writes: [...] [...], and this saves time during 'git branch --contains' queries that would otherwise walk "around" the commit we are inspecting. If I understand the code properly, what happens is that we can

Re: [PATCH v3 8/9] commit-graph: always load commit-graph information

On 4/18/2018 8:02 PM, Jakub Narebski wrote: Derrick Stolee writes: Most code paths load commits using lookup_commit() and then parse_commit(). In some cases, including some branch lookups, the commit is parsed using parse_object_buffer() which side-steps parse_commit()

Re: [PATCH v2 1/1] completion: load completion file for external subcommand

On Thu, Apr 19, 2018 at 9:07 PM, Florian Gamböck wrote: > On 2018-04-18 21:51, SZEDER Gábor wrote: >> >> On Tue, Apr 10, 2018 at 10:28 PM, Florian Gamböck wrote: >>> >>> Adding external subcommands to Git is as easy as to put an executable >>> file git-foo into

Re: [PATCH v2 0/6] Teach '--column-number' to 'git-grep(1)'

Taylor Blau writes: >> It seems that these two used to be "even when it is configured not >> to show linenumber, with -n it is shown and without -n it is not, >> when the new --column-number feature forces the command to show the >> "filename plus colon plus location info plus

Re: [PATCH v3 5/9] ref-filter: use generation number for --contains

On 4/18/2018 5:02 PM, Jakub Narebski wrote: Here I can offer only the cursory examination, as I don't know this area of code in question. Derrick Stolee writes: A commit A can reach a commit B only if the generation number of A is larger than the generation number of

Re: [PATCH 0/6] Compute and consume generation numbers

On 4/21/2018 4:44 PM, Jakub Narebski wrote: Jakub Narebski writes: Derrick Stolee writes: On 4/11/2018 3:32 PM, Jakub Narebski wrote: What would you suggest as a good test that could imply performance? The Google Colab notebook linked to above includes a

Re: [PATCH v3 0/9] Compute and consume generation numbers

On 4/18/2018 8:04 PM, Jakub Narebski wrote: Derrick Stolee writes: -- >8 -- This is the one of several "small" patches that follow the serialized Git commit graph patch (ds/commit-graph) and lazy-loading trees (ds/lazy-load-trees). As described in

Feature Request: option for git difftool to show changes in submodule contents

Hello, A coworker of mine was trying to use git difftool in a repository with submodules and we found that it only shows the change in the subproject commit hash. The option to show the changes in the contents of the submodules exists for git diff. Can this be added to difftool as well?

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

On 23/04/18 13:20, Johannes Schindelin wrote: Hi Phillip, On Sat, 21 Apr 2018, Phillip Wood wrote: On 21/04/18 11:33, Johannes Schindelin wrote: This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the

Re: [PATCH v1 0/5] Allocate cache entries from memory pool

On 04/18/2018 12:49 AM, Junio C Hamano wrote: Jameson Miller writes: This patch series improves the performance of loading indexes by reducing the number of malloc() calls. ... Jameson Miller (5): read-cache: teach refresh_cache_entry to take istate Add an API

Re: Is support for 10.8 dropped?

Hi, Eric, On Sun, Apr 22, 2018 at 12:37 AM, Eric Sunshine wrote: > On Sun, Apr 22, 2018 at 1:15 AM, Igor Korot wrote: >> MyMac:git-2.17.0 igorkorot$ cat config.mak >> NO_GETTEXT=Yes >> NO_OPENSSL=Yes >> >> MyMac:dbhandler igorkorot$

Re: [PATCH v1 0/5] Allocate cache entries from memory pool

On 04/20/2018 01:49 PM, Stefan Beller wrote: base-commit: cafaccae98f749ebf33495aec42ea25060de8682 I couldn't quite figure out what these five patches were based on, even with this line. Basing on and referring to a commit that is not part of our published history with "base-commit" is not

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/21/2018 12:23 AM, Junio C Hamano wrote: Elijah Newren writes: +merge.renames:: + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. This is the default.

Re: Is support for 10.8 dropped?

Hi, Brian, On Sun, Apr 22, 2018 at 12:49 PM, brian m. carlson wrote: > On Sun, Apr 22, 2018 at 12:10:20AM -0700, Perry Hutchison wrote: >> Eric Sunshine wrote: >> > On Sun, Apr 22, 2018 at 1:15 AM, Igor Korot wrote: >> >

SEC_E_BUFFER_TOO_SMALL on Windows

Hello all, We are seeing intermittent errors with Git 2.16.2.windows.1 on Windows 7 connecting to TFS 2017 (running in a Jenkins slave process): ERROR: Error cloning remote repo 'origin' hudson.plugins.git.GitException: Command "C:\tools\Git\bin\git.exe fetch --tags --progress

Re: SEC_E_BUFFER_TOO_SMALL on Windows

On Mon, Apr 23, 2018 at 11:13:41AM -0500, Jason B. Nance wrote: > Hello all, > > We are seeing intermittent errors with Git 2.16.2.windows.1 on Windows > 7 connecting to TFS 2017 (running in a Jenkins slave process): > > ERROR: Error cloning remote repo 'origin' >

Re: [RFC 00/10] Make .the gitmodules file path configurable

Hi, Antonio Ospite wrote: > vcsh[1] uses bare git repositories and detached work-trees to manage > *distinct* sets of configuration files directly into $HOME. Cool! I like the tooling you're creating for this, though keep in mind that Git has some weaknesses as a tool for deployment. In

Re: [PATCH v1 3/5] mem-pool: fill out functionality

On Mon, 23 Apr 2018 13:27:09 -0400 Jameson Miller wrote: > > This seems overly complicated - the struct mem_pool already has a linked > > list of pages, so couldn't you create a custom page and insert it behind > > the current front page instead whenever you needed a

Re: [PATCH v10 00/36] Add directory rename detection to git

Hi Junio, On Thu, Apr 19, 2018 at 8:05 PM, Junio C Hamano wrote: >> On Thu, Apr 19, 2018 at 10:57 AM, Elijah Newren wrote: >>> This series is a reboot of the directory rename detection series that was >>> merged to master and then reverted due to the final

Re: [RFC PATCH v10 32.5/36] unpack_trees: fix memory corruption with split_index when src != dst

On Mon, Apr 23, 2018 at 10:37 AM, Duy Nguyen wrote: >>> [1] To me the second parameter should be src_index, not dst_index. >>> We're copying entries from _source_ index to "result" and we should >>> also copy extensions from the source index. That line happens to work >>> only

Re: [PATCH v3 0/4] rebase -i: avoid stale "# This is a combination of" in commit messages

On Sat, Apr 21, 2018 at 12:34 AM, Johannes Schindelin wrote: > Eric Sunshine pointed out that I had such a commit message in > https://public-inbox.org/git/CAPig+cRrS0_nYJJY=o6cbov630snqhpv5qgrqdd8mw-syzn...@mail.gmail.com/ > and I went on a hunt to figure out how the

Re: [PATCH v1 3/5] mem-pool: fill out functionality

On 04/23/2018 01:49 PM, Jonathan Tan wrote: On Mon, 23 Apr 2018 13:27:09 -0400 Jameson Miller wrote: This seems overly complicated - the struct mem_pool already has a linked list of pages, so couldn't you create a custom page and insert it behind the current

Re: Is support for 10.8 dropped?

On Mon, Apr 23, 2018 at 12:31 PM, Igor Korot wrote: > 1. Is the file name "config.mak" or "config.make"? "config.mak" > 2. Do I have to do "make clean" or just remove the line and o "make"? "make clean" would not hurt.

Re: [RFC PATCH v10 32.5/36] unpack_trees: fix memory corruption with split_index when src != dst

Hi, On Sun, Apr 22, 2018 at 5:38 AM, Duy Nguyen wrote: >> - there's a better, more performant fix or there is some way to actually >> share a split_index between two independent index_state objects. > > A cleaner way of doing this would be something to the line [1] > >

Re: [PATCH v10 00/36] Add directory rename detection to git

On Thu, Apr 19, 2018 at 10:57 AM, Elijah Newren wrote: > Additional testing: > > * I've re-merged all ~13k merge commits in git.git with both > git-2.17.0 and this version of git, comparing the results to each > other in detail. (Including stdout & stderr, as well as

Re: [PATCH v1 0/5] Allocate cache entries from memory pool

On 04/20/2018 07:34 PM, Jonathan Tan wrote: On Tue, 17 Apr 2018 16:34:39 + Jameson Miller wrote: Jameson Miller (5): read-cache: teach refresh_cache_entry to take istate Add an API creating / discarding cache_entry structs mem-pool: fill out functionality

Re: [PATCH v1 0/5] Allocate cache entries from memory pool

On Mon, Apr 23, 2018 at 9:44 AM, Jameson Miller wrote: > I would be interested to understand how the > mem_pool would fit your needs, and if it is sufficient or needs modification > for your use cases. > >> [1] proof of concept in patches nearby >>

Re: [PATCH v1 3/5] mem-pool: fill out functionality

On 04/20/2018 07:21 PM, Jonathan Tan wrote: On Tue, 17 Apr 2018 16:34:42 + Jameson Miller wrote: @@ -19,8 +19,27 @@ struct mem_pool { /* The total amount of memory allocated by the pool. */ size_t pool_alloc; + + /* +* Array of pointers

Re: [PATCH v2 1/1] completion: load completion file for external subcommand

On 2018-04-23 17:12, SZEDER Gábor wrote: On Thu, Apr 19, 2018 at 9:07 PM, Florian Gamböck wrote: On 2018-04-18 21:51, SZEDER Gábor wrote: Would it be possible to use _xfunc() instead to plug that hole? It seems the be tricky, because that function not only sources but also

Re: [RFC PATCH v10 32.5/36] unpack_trees: fix memory corruption with split_index when src != dst

On Mon, Apr 23, 2018 at 7:09 PM, Elijah Newren wrote: > Hi, > > On Sun, Apr 22, 2018 at 5:38 AM, Duy Nguyen wrote: >>> - there's a better, more performant fix or there is some way to actually >>> share a split_index between two independent index_state

[PATCH 1/2] Makefile: remove unused @@PERLLIBDIR@@ substitution variable

Junio noticed that this variable is not quoted correctly when it is passed to sed. As a shell-quoted string, it should be inside single-quotes like $(perllibdir_relative_SQ), not outside them like $INSTLIBDIR. In fact, this substitution variable is not used. Simplify by removing it.

[PATCH 7/9] packfile: add repository argument to unpack_entry

Add a repository argument to allow the callers of unpack_entry 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 9/9] cache.h: allow sha1_object_info to handle arbitrary repositories

This involves also adapting sha1_object_info_extended and a some internal functions that are used to implement these. It all has to happen in one patch, because of a single recursive chain of calls visits all these functions. Signed-off-by: Jonathan Nieder Signed-off-by:

[PATCH 4/9] packfile: add repository argument to packed_to_object_type

Add a repository argument to allow the callers of packed_to_object_type 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

[PATCH 8/9] packfile: add repository argument to cache_or_unpack_entry

Add a repository argument to allow the callers of cache_or_unpack_entry 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 5/9] packfile: add repository argument to packed_object_info

From: Jonathan Nieder Add a repository argument to allow callers of packed_object_info 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

Re: [PATCH v10 00/36] Add directory rename detection to git

On Mon, Apr 23, 2018 at 4:46 PM, Junio C Hamano wrote: > Elijah Newren writes: > >> Out of 53288 merge commits with exactly two parents in linux.git: >> - 48491 merged identically >> - 4737 merged the same other than a few different "Auto-merging >> "

Re: [PATCH v4 00/11] Deprecate .git/info/grafts

On Sat, Apr 21, 2018 at 2:43 AM, Johannes Schindelin wrote: > It is fragile, as there is no way for the revision machinery to say "but > now I want to traverse the graph ignoring the graft file" e.g. when > pushing commits to a remote repository (which, as a

Re: Git Bash Completion Not Working In Emacs

Thank you Andreas, Is there a way to use git bash completion with "M-x shell"? Marko On Mon, Apr 16, 2018 at 11:25 AM, Andreas Schwab wrote: > On Apr 16 2018, Marko Vasic wrote: > >> Git bash completion script works perfectly under the terminal, >>

Re: [PATCH v3 0/4] rebase -i: avoid stale "# This is a combinationof" in commit messages

On 23/04/18 19:11, Stefan Beller wrote: On Sat, Apr 21, 2018 at 12:34 AM, Johannes Schindelin wrote: Eric Sunshine pointed out that I had such a commit message in https://public-inbox.org/git/CAPig+cRrS0_nYJJY=o6cbov630snqhpv5qgrqdd8mw-syzn...@mail.gmail.com/ and I

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On Mon, Apr 23, 2018 at 09:15:09AM -0400, Ben Peart wrote: > In commit 2a2ac926547 when merge.renamelimit was added, it was decided to > have separate settings for merge and diff to give users the ability to > control that behavior. In this particular case, it will default to the > value of

[PATCH v8 0/4] worktree: teach "add" to check out existing branches

Thanks Eric and Junio for the review the suggestions in the last round. Previous rounds are at <20180121120208.12760-1-t.gumme...@gmail.com>, <20180204221305.28300-1-t.gumme...@gmail.com>, <20180317220830.30963-1-t.gumme...@gmail.com>, <2018031719.4940-1-t.gumme...@gmail.com>,

[PATCH v8 1/4] worktree: remove extra members from struct add_opts

There are two members of 'struct add_opts', which are only used inside the 'add()' function, but being part of 'struct add_opts' they are needlessly also passed to the 'add_worktree' function. Make them local to the 'add()' function to make it clearer where they are used. Signed-off-by: Thomas

Re: Is support for 10.8 dropped?

Eric, On Mon, Apr 23, 2018 at 4:04 PM, Eric Sunshine wrote: > On Mon, Apr 23, 2018 at 3:58 PM, Totsten Bögershausen wrote: >> On 2018-04-23 18:53, Eric Sunshine wrote: >>> On Mon, Apr 23, 2018 at 12:31 PM, Igor Korot wrote: 1. Is

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

From: "Johannes Schindelin" : Monday, April 23, 2018 1:03 PM Subject: Re: [PATCH v8 06/16] sequencer: introduce the `merge` command Hi Philip, [...] > label onto > > # Branch abc > reset onto Is this reset strictly necessary. We are already there @head.

Re: [PATCH v4 04/11] replace: "libify" create_graft() and callees

Hi Johannes, On Fri, Apr 20, 2018 at 3:21 PM, Johannes Schindelin wrote: > @@ -250,27 +257,38 @@ static void import_object(struct object_id *oid, enum > object_type type, > - if (strbuf_read(, cmd.out, 41) < 0) > -

Re: [RFC PATCH] checkout: Force matching mtime between files

On Fri, Apr 13, 2018 at 07:01:29PM +0200, Michał Górny wrote: > Currently git does not control mtimes of files being checked out. This > means that the only assumption you could make is that all files created > or modified within a single checkout action will have mtime between > start time and

Re: Is support for 10.8 dropped?

On Mon, Apr 23, 2018 at 3:58 PM, Totsten Bögershausen wrote: > On 2018-04-23 18:53, Eric Sunshine wrote: >> On Mon, Apr 23, 2018 at 12:31 PM, Igor Korot wrote: >>> 1. Is the file name "config.mak" or "config.make"? >> >> "config.mak" > > I am confused, I have

[PATCH v8 4/4] worktree: teach "add" to check out existing branches

Currently 'git worktree add ' creates a new branch named after the basename of the path by default. If a branch with that name already exists, the command refuses to do anything, unless the '--force' option is given. However we can do a little better than that, and check the branch out if it is

[PATCH v8 3/4] worktree: factor out dwim_branch function

Factor out a dwim_branch function, which takes care of the dwim'ery in 'git worktree add '. It's not too much code currently, but we're adding a new kind of dwim in a subsequent patch, at which point it makes more sense to have it as a separate function. Factor it out now to reduce the patch

[PATCH v8 2/4] worktree: improve message when creating a new worktree

Currently 'git worktree add' produces output like the following: Preparing ../foo (identifier foo) HEAD is now at 26da330922 The '../foo' is the path where the worktree is created, which the user has just given on the command line. The identifier is an internal implementation detail,

Re: Feature Request: option for git difftool to show changes in submodule contents

Hi Oshaben! On Mon, Apr 23, 2018 at 7:49 AM, Oshaben Nicholas wrote: > Hello, > > A coworker of mine was trying to use git difftool in a repository with > submodules and we found that it only shows the change in the subproject > commit hash. The option to show

Re: Is support for 10.8 dropped?

On 2018-04-23 18:53, Eric Sunshine wrote: On Mon, Apr 23, 2018 at 12:31 PM, Igor Korot wrote: 1. Is the file name "config.mak" or "config.make"? "config.mak" I am confused, I have these file in my tree: config.mak.in config.mak.uname Makefile Setting options is

Re: [PATCH v3 7/9] commit: add short-circuit to paint_down_to_common()

Derrick Stolee writes: > On 4/18/2018 7:19 PM, Jakub Narebski wrote: >> Derrick Stolee writes: >> > [...] >>> [...], and this saves time during 'git branch --contains' queries >>> that would otherwise walk "around" the commit we are inspecting. >>> >> If

GSoC students and mentors in 2018

Hi Git community, This year we'll participate once again in Google Summer or Code! We'll have 3 students and 3 mentors, which is more than in recent years. Paul-Sebastian Ungureanu mentored by DScho, wants to convert git-stash into a builtin. Alban Gruin and Pratik Karki want to convert parts

[PATCH 2/9] cache.h: add repository argument to oid_object_info

Add a repository argument to allow the callers of oid_object_info 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. In the expanded macro the identifier

[PATCH 0/9] object store: oid_object_info is the next contender

This applies on top of origin/sb/object-store-replace and is available as https://github.com/stefanbeller/git/tree/oid_object_info This continues the work of sb/packfiles-in-repository, extending the layer at which we have to pass in an explicit repository object to oid_object_info. A test merge

[PATCH 1/9] cache.h: add repository argument to oid_object_info_extended

Add a repository argument to allow oid_object_info_extended callers 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. Signed-off-by: Stefan Beller

[PATCH 11/41] tree-walk: avoid hard-coded 20 constant

Use the_hash_algo to look up the length of our current hash instead of hard-coding the value 20. Signed-off-by: brian m. carlson --- tree-walk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-walk.c b/tree-walk.c index

[PATCH 12/41] tree-walk: convert get_tree_entry_follow_symlinks to object_id

Since the only caller of this function already uses struct object_id, update get_tree_entry_follow_symlinks to use it in parameters and internally. Signed-off-by: brian m. carlson --- sha1_name.c | 4 ++-- tree-walk.c | 16 tree-walk.h | 2 +- 3

[PATCH 08/41] packfile: abstract away hash constant values

There are several instances of the constant 20 and 20-based values in the packfile code. Abstract away dependence on SHA-1 by using the values from the_hash_algo instead. Use unsigned values for temporary constants to provide the compiler with more information about what kinds of values it

[PATCH 3/9] packfile: add repository argument to retry_bad_packed_offset

Add a repository argument to allow the callers of retry_bad_packed_offset 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

[PATCH 6/9] packfile: add repository argument to read_object

Add a repository argument to allow the callers of read_object 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 10/41] pack-redundant: abstract away hash algorithm

Instead of using hard-coded instances of the constant 20, use the_hash_algo to look up the correct constant. Signed-off-by: brian m. carlson --- builtin/pack-redundant.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git

Re: [PATCH 9/9] cache.h: allow sha1_object_info to handle arbitrary repositories

On Mon, Apr 23, 2018 at 5:34 PM, brian m. carlson wrote: > On Mon, Apr 23, 2018 at 04:43:27PM -0700, Stefan Beller wrote: >> This involves also adapting sha1_object_info_extended and a some >> internal functions that are used to implement these. It all has to >>

[PATCH 2/3] ls-remote: send server options when using protocol v2

Teach ls-remote to optionally accept server options by specifying them on the cmdline via '-o' or '--server-option'. These server options are sent to the remote end when querying for the remote end's refs using protocol version 2. If communicating using a protocol other than v2 the provided

[PATCH 1/3] serve: introduce the server-option capability

Introduce the "server-option" capability to protocol version 2. This enables future clients the ability to send server specific options in command requests when using protocol version 2. Signed-off-by: Brandon Williams --- Documentation/technical/protocol-v2.txt | 10

[PATCH 0/3] optionally send server-options when using v2

Building on top of protocol version 2 this series adds the ability to optionally send server specific options when using protocol v2. This resembles the "push-options" feature except server options are sent as capability lines during a command request allowing for all current and future commands

[PATCH 3/3] fetch: send server options when using protocol v2

Teach fetch to optionally accept server options by specifying them on the cmdline via '-o' or '--server-option'. These server options are sent to the remote end when performing a fetch communicating using protocol version 2. If communicating using a protocol other than v2 the provided options

[PATCH dj/runtime-prefix 0/2] Handle $IFS in $INSTLIBDIR

Hi, Johannes Sixt wrote: > Am 05.12.2017 um 22:35 schrieb Junio C Hamano: > > Dan Jacques writes: >>> Thanks for checking! The patch that you quoted above looks like it's from >>> this "v4" thread; however, the patch that you are diffing against in your >>> latest reply seems

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

Ben Peart writes: >> I also had to wonder how "merge -s resolve" faired, if the project >> is not interested in renamed paths at all. >> > > To be clear, it isn't that we're not interested in detecting renamed > files and paths. We're just opposed to it taking an hour to

[PATCH 20/41] dir: convert struct untracked_cache_dir to object_id

Convert the exclude_sha1 member of struct untracked_cache_dir and rename it to exclude_oid. Eliminate several hard-coded integral constants, and update a function name that referred to SHA-1. Signed-off-by: brian m. carlson --- dir.c

[PATCH 28/41] merge: convert empty tree constant to the_hash_algo

To avoid dependency on a particular hash algorithm, convert a use of EMPTY_TREE_SHA1_HEX to use the_hash_algo->empty_tree instead. Since both branches now use oid_to_hex, condense the if statement into a ternary. Signed-off-by: brian m. carlson --- merge.c | 5

[PATCH 17/41] pack-redundant: convert linked lists to use struct object_id

Convert struct llist_item and the rest of the linked list code to use struct object_id. Add a use of GIT_MAX_HEXSZ to avoid a dependency on a hard-coded constant. Signed-off-by: brian m. carlson --- builtin/pack-redundant.c | 50

[PATCH 36/41] sequencer: use the_hash_algo for empty tree object ID

To ensure that we are hash algorithm agnostic, use the_hash_algo to look up the object ID for the empty tree instead of using the empty_tree_oid variable. Signed-off-by: brian m. carlson --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH 21/41] http: eliminate hard-coded constants

Use the_hash_algo to find the right size for parsing pack names. Signed-off-by: brian m. carlson --- http.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/http.c b/http.c index 3034d10b68..ec70676748 100644 --- a/http.c +++ b/http.c

[PATCH 39/41] Update shell scripts to compute empty tree object ID

Several of our shell scripts hard-code the object ID of the empty tree. To avoid any problems when changing hashes, compute this value on startup of the script. For performance, store the value in a variable and reuse it throughout the life of the script. Signed-off-by: brian m. carlson

[PATCH 04/41] packfile: remove unused member from struct pack_entry

The sha1 member in struct pack_entry is unused except for one instance in which we store a value in it. Since nobody ever reads this value, don't bother to compute it and remove the member from struct pack_entry. Signed-off-by: brian m. carlson --- cache.h| 1

[PATCH 07/41] packfile: convert find_pack_entry to object_id

Convert find_pack_entry and the static function fill_pack_entry to take pointers to struct object_id. Signed-off-by: brian m. carlson --- packfile.c | 12 ++-- packfile.h | 2 +- sha1_file.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-)

[PATCH 02/41] server-info: remove unused members from struct pack_info

The head member of struct pack_info is completely unused and the nr_heads member is used only in one place, which is an assignment. Since these structure members are not useful, remove them. Signed-off-by: brian m. carlson --- server-info.c | 3 --- 1 file changed,

  1   2   >