Re: [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)'

Hi Taylor On 09/05/18 03:13, Taylor Blau wrote: Teach 'git-grep(1)' a new option, '--column', to show the column number of the first match on a non-context line. This makes it possible to teach 'contrib/git-jump/git-jump' how to seek to the first matching position of a grep match in your

Re: [PATCH v3 09/12] get_short_oid / peel_onion: ^{tree} should be tree, not treeish

On Wed, May 09 2018, Jeff King wrote: > On Tue, May 08, 2018 at 08:53:10PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> >> "X^{tree}" should *RESULT* in a tree, but it should *REQUIRE* X to >> >> be a tree-ish. It is unclear "should be tree" is about the former >> >> and I read (perhaps mis-read)

Re: regarding fix on "git clone $there $here"

Leslie Wang writes: > At 2.14.1 or 2.15.1, if I run command like > - mkdir /tmp/111 > - git clone g...@github.com:111/111 /tmp/111 > > because it will failure, then /tmp/111 will be removed automatically. Yes, this was a (longstanding) bug that nobody bothered to fix for a

Re: [PATCH v3 09/12] get_short_oid / peel_onion: ^{tree} should be tree, not treeish

On Tue, May 08, 2018 at 08:53:10PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> "X^{tree}" should *RESULT* in a tree, but it should *REQUIRE* X to > >> be a tree-ish. It is unclear "should be tree" is about the former > >> and I read (perhaps mis-read) it as saying "it should require X to > >> be

Re: [PATCH 1/2] gitk: show part of submodule log instead of empty pane when listing trees

Stefan Beller, Tue, May 08, 2018 19:07:29 +0200: > On Tue, May 8, 2018 at 5:22 AM, Alex Riesen > wrote: > > Currently, the submodules either are not shown at all (if listing a > > committed tree) or a Tcl error appears (when clicking on a submodule > > from the index

Re: [PATCH v4 4/4] rebase --skip: clean up commit message after a failed fixup/squash

On 06/05/18 18:50, Phillip Wood wrote: Hi Johannes, sorry it's taken me a while to look at this. I think it mostly makes sense to me, the code is well documented. I've got one comment below On 27/04/18 21:48, Johannes Schindelin wrote: During a series of fixup/squash commands, the interactive

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

On Tue, May 08, 2018 at 11:09:22PM +, brian m. carlson wrote: > On Tue, May 08, 2018 at 09:28:14AM -0400, Jeff King wrote: > > OK, so my question then is: what does just-gpgsm support look like? > > > > Do we literally add gpgsm.program? My thought was that taking us the > > first step

Re: [PATCH] git-p4: add options --commit and --disable-rebase

On 8 May 2018 at 01:37, Merland Romain wrote: > From f5229be8e2a3340af853227929818940323a8062 Mon Sep 17 00:00:00 2001 > From: Romain Merland > Date: Tue, 8 May 2018 02:03:11 +0200 > Subject: [PATCH] git-p4: add options --commit and --disable-rebase > To:

Dear Friend Please Respond.

From:Alimata Kabore. Bill and Exchange Manager Micro Finance Bank Plc Burkina Faso Dear Friend, I know that this mail will come to you as a surprise. I am Alimata Kabore. and I am the bill and Exchange manager in a Bank here in my country .I Hope that you will not expose or betray this trust

[PATCH] gitk: do not limit tree mode listing in the file list panel to current sub-directory

From: Alex Riesen The previous behavior conflicts with the "Patch" mode of the panel, which always shows the changes from the top-level of the repository. It is also impossible to get back to the full listing without restarting gitk. --- Bert Wesarg, Wed, May 09, 2018

Re: [PATCH v2] mailmap: update brian m. carlson's email address

On Wednesday 09 May 2018 05:49 AM, brian m. carlson wrote: > Correct, it doesn't. In my case, I was using --pretty='%aN <%aE>', > which is how I noticed it in the first place. So, how about updating the commit message to avoid confusions to the incidental future reader? (Or is it just not worth

Re: [PATCH 2/2] gitk: add an option to run gitk on an item in the file list

On Tue, May 8, 2018 at 3:39 PM, Alex Riesen wrote: > Bert Wesarg, Tue, May 08, 2018 15:17:03 +0200: >> On Tue, May 8, 2018 at 2:22 PM, Alex Riesen >> wrote: >> > +proc flist_gitk {} { >> > +global flist_menu_file findstring gdttype

Re: regarding fix on "git clone $there $here"

On Tue, May 08, 2018 at 10:25:58PM -0700, Leslie Wang wrote: > Recently we try to upgrade ubuntu from 17.10 to 18.04, then we found > one inconsistent behavior on git clone. > > At 2.14.1 or 2.15.1, if I run command like > - mkdir /tmp/111 > - git clone g...@github.com:111/111 /tmp/111 > >

Re: [PATCH] wrap-for-bin.sh: facilitate running Git executables under valgrind

Hi Antonio, On Wed, May 9, 2018 at 6:28 AM, Antonio Ospite wrote: > Testing locally built git executables under valgrind is not immediate. > > Something like the following does not work: > > $ valgrind ./bin-wrappers/git > > because the wrapper script forks and execs the command

Re: [PATCH] wrap-for-bin.sh: facilitate running Git executables under valgrind

On Wed, 9 May 2018 08:25:21 -0700 Elijah Newren wrote: > Hi Antonio, > Hi Elijah, > On Wed, May 9, 2018 at 6:28 AM, Antonio Ospite wrote: > > Testing locally built git executables under valgrind is not immediate. > > > > Something like the following does not

Re: [PATCH 1/1] commit-graph: fix UX issue when .lock file exists

On Wed, May 09, 2018 at 02:15:38PM +, Derrick Stolee wrote: > The commit-graph file lives in the .git/objects/info directory. > Previously, a failure to acquire the commit-graph.lock file was > assumed to be due to the lack of the info directory, so a mkdir() > was called. This gave incorrect

Re: Implementing reftable in Git

On 5/9/2018 10:33 AM, Christian Couder wrote: Hi, I might start working on implementing reftable in Git soon. During the last Git Merge conference last March Stefan talked about reftable. In Alex Vandiver's notes [1] it is asked that people announce it on the list when they start working on

Is rebase --force-rebase any different from rebase --no-ff?

Right now in "git help rebase" for --no-ff: "Without --interactive, this is a synonym for --force-rebase." But *with* --interactive, is there any difference? After doing some tests and looking in the source I couldn't find any difference between those two at all. Probably, there was a

Re: [PATCH 0/1] Fix UX issue with commit-graph.lock

On Wed, May 9, 2018 at 4:15 PM, Derrick Stolee wrote: > We use the lockfile API to avoid multiple Git processes from writing to > the commit-graph file in the .git/objects/info directory. In some cases, > this directory may not exist, so we check for its existence. > > The

Re: Implementing reftable in Git

On Wed, May 9, 2018 at 4:33 PM, Christian Couder wrote: > Hi, > > I might start working on implementing reftable in Git soon. Adding Michael Haggerty who did lots of work on ref stuff. He probably can give a few suggestions. You probably should also look at the last

Re: [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)'

On Wed, May 9, 2018 at 4:13 AM, Taylor Blau wrote: > diff --git a/builtin/grep.c b/builtin/grep.c > index 5f32d2ce84..f9f516dfc4 100644 > --- a/builtin/grep.c > +++ b/builtin/grep.c > @@ -829,6 +829,7 @@ int cmd_grep(int argc, const char **argv, const char > *prefix) >

Implementing reftable in Git

Hi, I might start working on implementing reftable in Git soon. During the last Git Merge conference last March Stefan talked about reftable. In Alex Vandiver's notes [1] it is asked that people announce it on the list when they start working on it, and it appears that there is a reference

Re: [PATCH] wrap-for-bin.sh: facilitate running Git executables under valgrind

On Wed, May 09, 2018 at 03:28:58PM +0200, Antonio Ospite wrote: > Testing locally built git executables under valgrind is not immediate. > > Something like the following does not work: > > $ valgrind ./bin-wrappers/git > > because the wrapper script forks and execs the command and valgrind

Re: [PATCH 1/1] commit-graph: fix UX issue when .lock file exists

On 5/9/2018 10:42 AM, Jeff King wrote: On Wed, May 09, 2018 at 02:15:38PM +, Derrick Stolee wrote: The commit-graph file lives in the .git/objects/info directory. Previously, a failure to acquire the commit-graph.lock file was assumed to be due to the lack of the info directory, so a

[PATCH v1] add status config and command line options for rename detection

Add a new config status.renames setting to enable turning off rename detection during status. This setting will default to the value of diff.renames. Add a new config status.renamelimit setting to to enable bounding the time spent finding out inexact renames during status. This setting will

Re: [PATCH v3 13/13] alloc: allow arbitrary repositories for alloc functions

On Tue, May 8, 2018 at 10:37 PM, Stefan Beller wrote: >>> +void release_tree_node(struct tree *t); >>> +void release_commit_node(struct commit *c); >>> +void release_tag_node(struct tag *t); >> >> Do these really need to be defined in alloc.c? I would think that it >> would be

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

On Wed, May 9, 2018 at 4:42 PM, Ben Peart wrote: > Add a new config status.renames setting to enable turning off rename detection > during status. This setting will default to the value of diff.renames. Please add the reason you need this config key in the commit

[PATCH] sha1dc: fix for compiling on AIX using IBM XLC compiler

Hello, first patch. I'm having trouble compiling on AIX using IBMs compiler, leading to unusable binaries. The following patch solved the problem for 2.17.0. The patch below is cut via gmail to allow for firewalls, but exists in an unmolested form on github:

Re: [PATCH] gitk: do not limit tree mode listing in the file list panel to current sub-directory

Thanks. On Wed, May 9, 2018 at 12:59 PM, Alex Riesen wrote: > From: Alex Riesen > > The previous behavior conflicts with the "Patch" mode of the panel, > which always shows the changes from the top-level of the repository. > It is also

Can not save changes into stash

How to reproduce: $ git update-index --skip-worktree conf/local.conf $ git pull Updating 0cd50c7..bde58f8 error: Your local changes to the following files would be overwritten by merge: conf/local.conf Please commit your changes or stash them before you merge. Aborting $ git stash save No

Re: [PATCH 4/5] lock_file: make function-local locks non-static

On Tue, May 8, 2018 at 8:18 PM, Jeff King wrote: > On Mon, May 07, 2018 at 05:24:05PM +0200, Duy Nguyen wrote: > >> - static struct lock_file lock; >> + struct lock_file lock = LOCK_INIT; >> >>> >> >>> Is it really safe to do this? I vaguely remember something

[PATCH v2 0/2] gitk: improve handling of submodules in the file list panel

Currently, the submodule entries in the file list panel are mostly ignored. This series attempts to improve the situation by showing part of submodule history when focusing it in the file list panel and by adding a menu element to start gitk in the submodule (similar to git gui). Alex Riesen (2):

[PATCH v2 1/2] gitk: show part of submodule log instead of empty pane when listing trees

From: Alex Riesen Currently, selecting a name in the file list (bottom right) panel in "Tree" mode does not do anything useful if the name is a submodule. If gitk is currently showing a commit, the submodule names are not shown at all (which is very confusing). If the gitk is

Re: Can not save changes into stash

I even can not drop local changes: $ git checkout local.conf error: pathspec 'local.conf' did not match any file(s) known to git. $ git log local.conf commit 6df8bab88fd703c6859954adc51b2abaad8f59ec Author: Eugen Konkov Date: Wed May 9 15:31:02 2018 +0300 Implement

[PATCH] doc: fix config API documentation about config_with_options

In commit dc8441fdb ("config: don't implicitly use gitdir or commondir", 2017-06-14) the function git_config_with_options was renamed to config_with_options to better reflect the fact that it does not access the git global config or the repo config by default. However

[PATCH] wrap-for-bin.sh: facilitate running Git executables under valgrind

Testing locally built git executables under valgrind is not immediate. Something like the following does not work: $ valgrind ./bin-wrappers/git because the wrapper script forks and execs the command and valgrind does not track children processes by default. Something like the following may

[PATCH 0/1] Fix UX issue with commit-graph.lock

We use the lockfile API to avoid multiple Git processes from writing to the commit-graph file in the .git/objects/info directory. In some cases, this directory may not exist, so we check for its existence. The existing code does the following when acquiring the lock: 1. Try to acquire the lock.

[PATCH 1/1] commit-graph: fix UX issue when .lock file exists

The commit-graph file lives in the .git/objects/info directory. Previously, a failure to acquire the commit-graph.lock file was assumed to be due to the lack of the info directory, so a mkdir() was called. This gave incorrect messaging if instead the lockfile was open by another process:

Re: [PATCH] gitk: do not limit tree mode listing in the file list panel to current sub-directory

Bert Wesarg, Wed, May 09, 2018 14:08:51 +0200: > >> I noticed that too, while testing your patch and I'm also confused. > >> But was not able to send a request to Paul yet. ls-tree --full-tree > >> seems to be one that should be used here, I think. > > > > Well, I just tried your suggestion.

[PATCH v2 1/2] gitk: show part of submodule log instead of empty pane when listing trees

From: Alex Riesen Currently, selecting a name in the file list (bottom right) panel in "Tree" mode does not do anything useful if the name is a submodule. If gitk is currently showing a commit, the submodule names are not shown at all (which is very confusing). If the gitk is

[PATCH v2 2/2] gitk: add an option to run gitk on an item in the file list

From: Alex Riesen Similar to a git gui feature which visualizes history in a submodule, the submodules cause the gitk be started inside the submodule. Signed-off-by: Alex Riesen --- gitk | 12 1 file changed, 12 insertions(+) diff --git

[PATCH v2 0/2] gitk: improve handling of submodules in the file list panel

From: Alex Riesen Currently, the submodule entries in the file list panel are mostly ignored. This series attempts to improve the situation by showing part of submodule history when focusing it in the file list panel and by adding a menu element to start gitk in the submodule

[PATCH v2 2/2] gitk: add an option to run gitk on an item in the file list

From: Alex Riesen Similar to a git gui feature which visualizes history in a submodule, the submodules cause the gitk be started inside the submodule. --- gitk | 12 1 file changed, 12 insertions(+) diff --git a/gitk b/gitk index 742f36b..c430dfe 100755 ---

Re: [PATCH v2 0/2] gitk: improve handling of submodules in the file list panel

Sorry for broken threading... I'll have to work on that. --- Diese E-Mail wurde von Avast Antivirus-Software auf Viren geprüft. https://www.avast.com/antivirus

Re: [PATCH] sha1dc: fix for compiling on AIX using IBM XLC compiler

On Wed, May 09 2018, jens persson wrote: > Hello, first patch. I'm having trouble compiling on AIX using IBMs > compiler, leading to > unusable binaries. The following patch solved the problem for 2.17.0. > The patch below is cut via gmail to allow for firewalls, but > exists in an unmolested

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

Hi Ben, Overall I think this is good, but I have lots of nit-picky things to bring up. :-) On Wed, May 9, 2018 at 7:42 AM, Ben Peart wrote: > Add status --no-renames command line option that enables overriding the config > setting from the command line. Add

Re: [PATCH 4/5] lock_file: make function-local locks non-static

On 9 May 2018 at 18:19, Duy Nguyen wrote: > On Tue, May 8, 2018 at 8:18 PM, Jeff King wrote: >> It should be totally safe. If you look at "struct lock_file", it is now >> simply a pointer to a tempfile allocated on the heap (in fact, I thought >> about getting

Re: [PATCHv2 0/4] Rebooting pc/submodule-helper-foreach

On Tue, 8 May 2018 17:29:48 -0700 Stefan Beller wrote: > v2: > * rebased onto origin/master > * dropped leftover "toplevel" variable from experimentation > * reworded the commit message for the first patch extensively > * dropped the third patch > * see "branch-diff" below.

Re: [PATCH] repository: fix free problem with repo_clear(the_repository)

On 05/09, Nguyễn Thái Ngọc Duy wrote: > the_repository is special. One of the special things about it is that > it does not allocate a new index_state object like submodules but > points to the global the_index variable instead. As a global variable, > the_index cannot be free()'d. > > Add an

Re: [PATCH] repository: fix free problem with repo_clear(the_repository)

On Wed, May 9, 2018 at 10:04 AM, Nguyễn Thái Ngọc Duy wrote: > the_repository is special. One of the special things about it is that > it does not allocate a new index_state object like submodules but > points to the global the_index variable instead. As a global variable, >

Re: Implementing reftable in Git

Hi Christian, On Wed, May 9, 2018 at 7:33 AM, Christian Couder wrote: > Hi, > > I might start working on implementing reftable in Git soon. Cool! Everyone is waiting for it as they dream about the performance and correctness benefits this brings. Benefits that I

Re: [PATCH] repository: fix free problem with repo_clear(the_repository)

On Wed, May 9, 2018 at 10:04 AM, Nguyễn Thái Ngọc Duy wrote: > the_repository is special. One of the special things about it is that > it does not allocate a new index_state object like submodules but > points to the global the_index variable instead. As a global variable, >

Re: Implementing reftable in Git

Hi all, On Wed, 2018-05-09 at 09:48 -0700, Jonathan Nieder wrote: > Hi, > > Christian Couder wrote: > > > I might start working on implementing reftable in Git soon. > > Yay! > > [...] > > So I think the most straightforward and compatible way to do it would > > be to port the JGit

Re: Implementing reftable in Git

On Wed, May 9, 2018 at 10:48 AM, Jonathan Nieder wrote: > Stefan Beller wrote: > >> * We *might* be able to use reftables in negotiation later >> ("client: Last I fetched, you said your latest transaction >> number was '5' with the hash over all refs to be ; >> server:

Re: [PATCH] repository: fix free problem with repo_clear(the_repository)

On Wed, May 9, 2018 at 7:42 PM, Elijah Newren wrote: > On Wed, May 9, 2018 at 10:04 AM, Nguyễn Thái Ngọc Duy > wrote: >> the_repository is special. One of the special things about it is that >> it does not allocate a new index_state object like submodules

Re: Implementing reftable in Git

Carlos Martín Nieto wrote: > On Wed, 2018-05-09 at 09:48 -0700, Jonathan Nieder wrote: >> If you would like the patches at https://git.eclipse.org/r/q/topic:reftable >> relicensed for Git's use so that you don't need to include that >> license header, let me know. Separate from any legal

Re: regarding fix on "git clone $there $here"

Thanks for the confirmation. It is very helpful! Best Regards Leslie Wang > On May 8, 2018, at 11:44 PM, Junio C Hamano wrote: > > Leslie Wang writes: > >> At 2.14.1 or 2.15.1, if I run command like >> - mkdir /tmp/111 >> - git clone

Re: Implementing reftable in Git

Hi, Christian Couder wrote: > I might start working on implementing reftable in Git soon. Yay! [...] > So I think the most straightforward and compatible way to do it would > be to port the JGit implementation. I suspect following the spec[1] would be even more compatible, since it would

[PATCH] repository: fix free problem with repo_clear(the_repository)

the_repository is special. One of the special things about it is that it does not allocate a new index_state object like submodules but points to the global the_index variable instead. As a global variable, the_index cannot be free()'d. Add an exception for this in repo_clear(). In the future

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

On 5/9/2018 11:59 AM, Duy Nguyen wrote: On Wed, May 9, 2018 at 4:42 PM, Ben Peart wrote: Add a new config status.renames setting to enable turning off rename detection during status. This setting will default to the value of diff.renames. Please add the reason you

Re: [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)'

On 9 May 2018 at 12:41, Phillip Wood wrote: > On 09/05/18 03:13, Taylor Blau wrote: >> >> +--column:: >> + Prefix the 1-indexed byte-offset of the first match on non-context >> lines. This >> + option is incompatible with '--invert-match', and extended >>

Re: Implementing reftable in Git

Stefan Beller wrote: > * We *might* be able to use reftables in negotiation later > ("client: Last I fetched, you said your latest transaction > number was '5' with the hash over all refs to be ; > server: ok, here are the refs and the pack, you're welcome"). Do you mean that reftable's

[PATCH] BUG_exit_code: fix sparse "symbol not declared" warning

Signed-off-by: Ramsay Jones --- Hi Johannes, If you need to re-roll your 'js/use-bug-macro' branch, could you please squash this into the relevant patch (commit a86303cb5d, "test-tool: help verifying BUG() code paths", 2018-05-02). This will, obviously, not be

Re: [PATCH v3 13/13] alloc: allow arbitrary repositories for alloc functions

On Tue, May 8, 2018 at 10:04 PM, Jonathan Tan wrote: > On Tue, 8 May 2018 12:37:36 -0700 > Stefan Beller wrote: > >> +void clear_alloc_state(struct alloc_state *s) >> +{ >> + while (s->slab_nr > 0) { >> + s->slab_nr--; >> +

Re: [PATCH] repository: fix free problem with repo_clear(the_repository)

On Wed, May 9, 2018 at 7:50 PM, Stefan Beller wrote: >> I was trying to test the new parsed_object_pool_clear() and found this. > > So this would go with the latest sb/object-store-alloc ? No this should be separate because sb/object-store-alloc did not even touch this code.

Re: [PATCH] repository: fix free problem with repo_clear(the_repository)

On Wed, May 9, 2018 at 11:00 AM, Duy Nguyen wrote: > On Wed, May 9, 2018 at 7:50 PM, Stefan Beller wrote: >>> I was trying to test the new parsed_object_pool_clear() and found this. >> >> So this would go with the latest sb/object-store-alloc ? > > No this

Re: Implementing reftable in Git

On Wed, May 09 2018, Stefan Beller wrote: > Hi Christian, > > On Wed, May 9, 2018 at 7:33 AM, Christian Couder > wrote: >> Hi, >> >> I might start working on implementing reftable in Git soon. > > Cool! Everyone is waiting for it as they dream about the > performance

Re: [PATCH v2 0/2] gitk: improve handling of submodules in the file list panel

On Wed, May 9, 2018 at 5:35 AM, Alex Riesen wrote: > From: Alex Riesen > > Currently, the submodule entries in the file list panel are mostly ignored. > This series attempts to improve the situation by showing part of submodule > history when

Re: Implementing reftable in Git

On Wed, 2018-05-09 at 10:54 -0700, Jonathan Nieder wrote: > Carlos Martín Nieto wrote: > > On Wed, 2018-05-09 at 09:48 -0700, Jonathan Nieder wrote: > > > If you would like the patches at https://git.eclipse.org/r/q/topi > > > c:reftable > > > relicensed for Git's use so that you don't need to

Re: Is rebase --force-rebase any different from rebase --no-ff?

+cc Marc and Johannes who know more about rebase. On Wed, May 9, 2018 at 9:01 AM, Ilya Kantor wrote: > Right now in "git help rebase" for --no-ff: > "Without --interactive, this is a synonym for --force-rebase." > > But *with* --interactive, is there any difference? I found

Re: [PATCH] sha1dc: fix for compiling on AIX using IBM XLC compiler

(+cc: Marc Stevens) Ævar Arnfjörð Bjarmason wrote: > On Wed, May 09 2018, jens persson wrote: >> Hello, first patch. I'm having trouble compiling on AIX using IBMs >> compiler, leading to >> unusable binaries. The following patch solved the problem for 2.17.0. >> The patch below is cut via gmail

Re: [PATCH v3 13/13] alloc: allow arbitrary repositories for alloc functions

On Wed, May 9, 2018 at 10:18 AM, Duy Nguyen wrote: > > If you want to reproduce, this is what I used to test this with. > > https://gist.github.com/pclouds/86a2df6c28043f1b6fa3d4e72e7a1276 This only applied cleanly after I created an empty file at t/helper/test-abc.c, using

Re: Is rebase --force-rebase any different from rebase --no-ff?

On 2018-05-09 02:21 PM, Stefan Beller wrote: +cc Marc and Johannes who know more about rebase. On Wed, May 9, 2018 at 9:01 AM, Ilya Kantor wrote: Right now in "git help rebase" for --no-ff: "Without --interactive, this is a synonym for --force-rebase." But *with*

Re: Is rebase --force-rebase any different from rebase --no-ff?

I tried to compare --force-rebase VS --no-ff for the following repository: http://jmp.sh/E7TRjcL There's no difference in the resulf of: git rebase --force-rebase 54a4 git rebase --no-ff 54a4 (rebases all 3 commits of feature) Also, there's no difference in interactive mode: git rebase

Hello

Am Mrs.Pamela Atuegbe, I work in one of the prime bank here in burkina faso, I want the bank to transfer the money left by our late customer is a foreigner from Korea. can you investment this money and also help the poor' the amount value at $13,300,000.00 (Thirteen Million Three Hundred

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

On 5/9/2018 12:56 PM, Elijah Newren wrote: Hi Ben, Overall I think this is good, but I have lots of nit-picky things to bring up. :-) Thank you for the review. I appreciate the extra set of eyes on these changes. Especially when dealing with the merge logic and settings which I am

Re: [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)'

On Wed, May 09, 2018 at 07:26:57PM +0200, Martin Ågren wrote: > On 9 May 2018 at 12:41, Phillip Wood wrote: > > On 09/05/18 03:13, Taylor Blau wrote: > >> > >> +--column:: > >> + Prefix the 1-indexed byte-offset of the first match on non-context > >> lines. This

Proposal

-- Hello Greetings to you please i have a business proposal for you contact me for more detailes asap thanks. Best Regards, Miss.Zeliha ömer faruk Esentepe Mahallesi Büyükdere Caddesi Kristal Kule Binasi No:215 Sisli - Istanbul, Turkey

[Best Practices Request] clean/smudge configuration

Hi Git Team, I'm trying to work out some best practices for managing clean/smudge filters and hit a bump. The situation is that I have an environment where the possible clean/smudge filter configuration can change over time and needs to be versioned with the product being managed in a git

Proposal

-- Hello Greetings to you please i have a business proposal for you contact me for more detailes asap thanks. Best Regards, Miss.Zeliha ömer faruk Esentepe Mahallesi Büyükdere Caddesi Kristal Kule Binasi No:215 Sisli - Istanbul, Turkey

Re: [PATCH 2/2] builtin/grep.c: teach '-o', '--only-matching' to 'git-grep'

On Tue, May 08, 2018 at 01:25:17PM -0400, Jeff King wrote: > On Sat, May 05, 2018 at 08:49:43AM +0200, Ævar Arnfjörð Bjarmason wrote: > > > > +test_expect_success 'grep --only-matching --heading' ' > > > + git grep --only-matching --heading --line-number --column mmap file > > > >actual && > > >

Re: [PATCH] fast-export: avoid NULL pointer arithmetic

Hi René, On Wed, 9 May 2018, René Scharfe wrote: > Clang 6 reports the following warning, which is turned into an error in a > DEVELOPER build: > > builtin/fast-export.c:162:28: error: performing pointer arithmetic on a > null pointer has undefined behavior

[PATCH 2/2] replace-object.c: remove the_repository from prepare_replace_object

This was missed in 5982da9d2ce (replace-object: allow prepare_replace_object to handle arbitrary repositories, 2018-04-11) Technically the code works correctly as the replace_map is the same size in different repositories, however it is hard to read. So convert the code to the familiar pattern of

[PATCH 1/2] object.c: free replace map in raw_object_store_clear

The replace map for objects was missed to free in the object store in the conversion of 174774cd519 (Merge branch 'sb/object-store-replace', 2018-05-08) Signed-off-by: Stefan Beller --- object.c | 1 + 1 file changed, 1 insertion(+) diff --git a/object.c b/object.c index

Proposal

-- Hello Greetings to you please i have a business proposal for you contact me for more detailes asap thanks. Best Regards, Miss.Zeliha ömer faruk Esentepe Mahallesi Büyükdere Caddesi Kristal Kule Binasi No:215 Sisli - Istanbul, Turkey

Re: [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)'

On Wed, May 09, 2018 at 06:17:20PM +0200, Duy Nguyen wrote: > On Wed, May 9, 2018 at 4:13 AM, Taylor Blau wrote: > > diff --git a/builtin/grep.c b/builtin/grep.c > > index 5f32d2ce84..f9f516dfc4 100644 > > --- a/builtin/grep.c > > +++ b/builtin/grep.c > > @@ -829,6 +829,7 @@

Re: [PATCH v5 5/7] builtin/grep.c: add '--column' option to 'git-grep(1)'

Taylor Blau writes: > This check we should retain and change the wording to mention '--and', > '--or', and '--not' specifically. Why are these problematic in the first place? If I said $ git grep -e first --and -e these $ git grep -e first --and --not -e those $

[PATCH v4 13/13] alloc: allow arbitrary repositories for alloc functions

We have to convert all of the alloc functions at once, because alloc_report uses a funky macro for reporting. It is better for the sake of mechanical conversion to convert multiple functions at once rather than changing the structure of the reporting function. We record all memory allocation in

[PATCH v4 09/13] alloc: add repository argument to alloc_report

This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH v4 08/13] alloc: add repository argument to alloc_object_node

This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH v4 05/13] alloc: add repository argument to alloc_tree_node

This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH v4 03/13] object: add repository argument to grow_object_hash

From: Jonathan Nieder Add a repository argument to allow the caller of grow_object_hash 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.

[PATCH v4 02/13] object: add repository argument to create_object

Add a repository argument to allow the callers of create_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. Signed-off-by: Jonathan Nieder

[PATCH v4 04/13] alloc: add repository argument to alloc_blob_node

This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH v4 10/13] alloc: add repository argument to alloc_commit_index

This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH v4 00/13] object store: alloc

v4: * address the memory issues, an interdiff is below. v3: * I used the (soon to be renamed?) branch-diff tool to attach a diff below between v2 and v3 * fixed comment in patch 1 * correctly free objects and its hashmap in the last patch. * drop free'ing the commit->util pointer as we do

[PATCH v4 06/13] alloc: add repository argument to alloc_commit_node

This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH v4 01/13] repository: introduce parsed objects field

Convert the existing global cache for parsed objects (obj_hash) into repository-specific parsed object caches. Existing code that uses obj_hash are modified to use the parsed object cache of the_repository; future patches will use the parsed object caches of other repositories. Another future use

[PATCH v4 11/13] object: allow grow_object_hash to handle arbitrary repositories

Reviewed-by: Jonathan Tan Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- object.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff

[PATCH v4 12/13] object: allow create_object to handle arbitrary repositories

Reviewed-by: Jonathan Tan Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- object.c | 12 ++-- object.h | 3 +-- 2 files changed, 7 insertions(+), 8

  1   2   >