Re: [PATCH v7 0/7] convert: add support for different encodings

2018-02-28 Thread Torsten Bögershausen
On Tue, Feb 27, 2018 at 04:25:38PM -0500, Jeff King wrote: > On Tue, Feb 27, 2018 at 10:05:17PM +0100, Torsten Bögershausen wrote: > > > The other question is: > > Would this help showing diffs of UTF-16 encoded files on a "git hoster", > > github/bitbucket/ ? > > Almost. There's probably one

Reduce pack-objects memory footprint?

2018-02-28 Thread Duy Nguyen
linux-2.6.git current has 6483999 objects. "git gc" on my poor laptop consumes 1.7G out of 4G RAM, pushing lots of data to swap and making all apps nearly unusuable (granted the problem is partly Linux I/O scheduler too). So I wonder if we can reduce pack-objects memory footprint a bit. This demon

Re: [PATCH v2 05/36] resolve-undo: convert struct resolve_undo_info to object_id

2018-02-28 Thread Duy Nguyen
On Tue, Feb 27, 2018 at 9:01 AM, brian m. carlson wrote: > On Mon, Feb 26, 2018 at 06:25:24PM +0700, Duy Nguyen wrote: >> On Mon, Feb 26, 2018 at 4:11 AM, brian m. carlson >> wrote: >> > @@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct >> > string_list *resolve_undo) >> >

Re: [PATCH] docs/pretty-formats: fix typo '% <()' -> '%<|()'

2018-02-28 Thread Duy Nguyen
On Wed, Feb 28, 2018 at 3:24 AM, Jonathan Nieder wrote: > Mårten Kongstad wrote: > >> Remove erroneous space between % and < in '% <()'. >> >> Signed-off-by: Mårten Kongstad >> --- >> Documentation/pretty-formats.txt | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Looks correct to m

RE

2018-02-28 Thread @Alice Walton
my name is Mrs. Alice Walton, a business woman an America Citizen and the heiress to the fortune of Walmart stores, born October 7, 1949. I have a mission for you worth $100,000,000.00(Hundred Million United State Dollars) which I intend using for CHARITY

Re: Reduce pack-objects memory footprint?

2018-02-28 Thread Jeff King
On Wed, Feb 28, 2018 at 04:27:22PM +0700, Duy Nguyen wrote: > linux-2.6.git current has 6483999 objects. "git gc" on my poor laptop > consumes 1.7G out of 4G RAM, pushing lots of data to swap and making > all apps nearly unusuable (granted the problem is partly Linux I/O > scheduler too). So I won

Re: Reduce pack-objects memory footprint?

2018-02-28 Thread Duy Nguyen
On Wed, Feb 28, 2018 at 5:17 PM, Jeff King wrote: > On Wed, Feb 28, 2018 at 04:27:22PM +0700, Duy Nguyen wrote: > >> linux-2.6.git current has 6483999 objects. "git gc" on my poor laptop >> consumes 1.7G out of 4G RAM, pushing lots of data to swap and making >> all apps nearly unusuable (granted t

Re: [PATCH v3 2/9] t3701: indent here documents

2018-02-28 Thread Phillip Wood
On 27/02/18 22:35, Junio C Hamano wrote: > Phillip Wood writes: > >> From: Phillip Wood >> >> Indent here documents in line with the current style for tests. >> >> Signed-off-by: Phillip Wood >> --- > > This loses the hand-edit-while-queuing done based on Eric's comment > for the previous roun

Re: [PATCH 3/5] merge-recursive: always roll back lock in `merge_recursive_generic()`

2018-02-28 Thread Martin Ågren
On 27 February 2018 at 22:30, Martin Ågren wrote: > If we return early, we forget to roll back the lockfile. Do so. > > Signed-off-by: Martin Ågren > --- > merge-recursive.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/merge-recursive.c b/merge-recursive.c > index

Re: [PATCH v3 4/9] t3701: don't hard code sha1 hash values

2018-02-28 Thread Phillip Wood
On 27/02/18 22:42, Junio C Hamano wrote: > Phillip Wood writes: > >> t/t3701-add-interactive.sh | 30 -- >> 1 file changed, 20 insertions(+), 10 deletions(-) >> >> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh >> index bdd1f292a9..46d655038f 100

Re: [PATCH v3 4/9] t3701: don't hard code sha1 hash values

2018-02-28 Thread Phillip Wood
On 28/02/18 11:03, Phillip Wood wrote: > On 27/02/18 22:42, Junio C Hamano wrote: >> Phillip Wood writes: >> >>> t/t3701-add-interactive.sh | 30 -- >>> 1 file changed, 20 insertions(+), 10 deletions(-) >>> >>> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-inte

Re: Reduce pack-objects memory footprint?

2018-02-28 Thread Jeff King
On Wed, Feb 28, 2018 at 05:58:50PM +0700, Duy Nguyen wrote: > > Yeah, the per object memory footprint is not great. Around 100 million > > objects it becomes pretty ridiculous. I started to dig into it a year or > > three ago when I saw such a case, but it turned out to be something that > > we co

Re: Reduce pack-objects memory footprint?

2018-02-28 Thread Duy Nguyen
On Wed, Feb 28, 2018 at 6:11 PM, Jeff King wrote: >> > The torvalds/linux fork network has ~23 million objects, >> > so it's probably 7-8 GB of book-keeping. Which is gross, but 64GB in a >> > server isn't uncommon these days. >> >> I wonder if we could just do book keeping for some but not all ob

hjfgjh

2018-02-28 Thread Lindsey
reply: Hey,i am Lindsey ,How's everything with you,I have interest on you after going through your profile I really want to have a good friendship with you.Beside i have something very vital to tell you

[PATCH] git-gui: Add hotkeys to change focus between ui widgets

2018-02-28 Thread Birger Skogeng Pedersen
The user cannot change focus between the list of files, the diff view and the commit message widgets without using the mouse (clicking either of the four widgets ). Hotkeys CTRL/CMD+number (1-4) now focuses the first file of either the "Unstaged Changes" or "Staged Changes", the diff view or the c

Worktree silently deleted on git fetch/gc/log

2018-02-28 Thread Дилян Палаузов
Hello, with git 2.16.2 I have two repositories: A (branch master) and B (branch g) which is a worktree of the first. This has always forked fine until yesterday, when I did: /git/B g>$ git fetch remote: Counting objects: 29, done. remote: Compressing objects: 100% (6/6), done. remote: Total 29

[FEATURE] git-gui: Staging path(s) should re-select a new path in "Unstaged Changes"

2018-02-28 Thread Birger Skogeng Pedersen
When a path is selected in "Unstaged Changes", it can be staged (obviously). When it is staged, the path goes to the "Staged Changes" list, and no (new) path is selected. I propose that this action should re-select a new path, from the list of paths in "Unstaged Changes". Steps to reproduce (in gi

Re: [PATCH v7 0/7] convert: add support for different encodings

2018-02-28 Thread Jeff King
On Wed, Feb 28, 2018 at 09:20:05AM +0100, Torsten Bögershausen wrote: > > 2. auto-detect utf-16 (your patch) > > - Just Works for existing repositories storing utf-16 > > > > - carries some risk of kicking in when people would like it not to > >(e.g., when they really do want

Re: ref-filter: how to improve the code

2018-02-28 Thread Jeff King
On Sun, Feb 25, 2018 at 09:28:25PM +0300, Оля Тележная wrote: > I am trying to remove cat-file formatting part and reuse same > functionality from ref-filter. > I have a problem that cat-file sometimes needs to continue running > even if the request is broken, while in ref-filter we invoke die() i

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

2018-02-28 Thread Jeff King
On Tue, Feb 27, 2018 at 12:33:56AM +0100, Johannes Schindelin wrote: > > So something like this helps: > > > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > > index 81c5b42875..71e6cbb388 100644 > > --- a/git-rebase--interactive.sh > > +++ b/git-rebase--interactive.sh > >

Re: [PATCH] revision.c: reduce object database queries

2018-02-28 Thread Derrick Stolee
On 2/28/2018 1:37 AM, Jeff King wrote: On Tue, Feb 27, 2018 at 03:16:58PM -0800, Junio C Hamano wrote: This code comes originally form 454fbbcde3 (git-rev-list: allow missing objects when the parent is marked UNINTERESTING, 2005-07-10). But later, in aeeae1b771 (revision traversal: allow UNINTE

Re: [PATCH 03/11] packfile: allow install_packed_git to handle arbitrary repositories

2018-02-28 Thread Derrick Stolee
On 2/27/2018 8:06 PM, Stefan Beller wrote: -void install_packed_git(struct packed_git *pack) +void install_packed_git(struct repository *r, struct packed_git *pack) This is a good thing to do. I'm just making note that this will collide with the new instances of install_packed_git() that I

Invoices attached

2018-02-28 Thread watertap
Good afternoon I've sent your invoices. Please email with any questions. >>> http://catchwrestlingcomics.com/Open-invoices/ Sincerely,

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Derrick Stolee
On 2/27/2018 9:15 PM, Duy Nguyen wrote: On Tue, Feb 27, 2018 at 05:05:57PM -0800, Stefan Beller wrote: This applies on top of origin/sb/object-store and is the continuation of that series, adding the repository as a context argument to functions. This series focusses on packfile handling, exp

RE: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Randall S. Becker
On February 28, 2018 2:49 AM, Peff wrote: > On Wed, Feb 28, 2018 at 07:42:51AM +, Eric Wong wrote: > > > > > > a) We could override the meaning of die() in Git.pm. This feels > > > > > ugly but if it works, it would be a very small patch. > > > > > > > > Unlikely to work since I think we

Re: [PATCH 2/2] t5556: replace test_i18ngrep with a simple grep

2018-02-28 Thread Ramsay Jones
On 28/02/18 00:42, SZEDER Gábor wrote: > On Wed, Feb 28, 2018 at 12:47 AM, Ramsay Jones > wrote: >> >> >> On 27/02/18 22:05, Junio C Hamano wrote: >>> Junio C Hamano writes: >>> OK, somehow I had the version from Ramsay on a topic branch that was not merged to 'pu'. Here is the repla

Re: [PATCH v3 2/9] t3701: indent here documents

2018-02-28 Thread Junio C Hamano
Phillip Wood writes: > Is there an easy way for contributors to compare the branch they post to > what ends up it pu? Distributed work is pretty much symmetric, so it can be done the same way as one would review a rerolled series by another co-worker. $ git log --oneline --first-parent origin/

Re: [PATCH 2/2] t5556: replace test_i18ngrep with a simple grep

2018-02-28 Thread Junio C Hamano
Ramsay Jones writes: >> However, I'm not sure about the authorship and taking credit for the >> patch. We ended up taking my patch, sure, but I think Ramsay did all >> the real hard work, i.e. writing the commit message and, most >> importantly, realizing that something is wrong with that '...|

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Junio C Hamano
Jeff King writes: > You're right. I cut down my example too much and dropped the necessary > eval magic. Try this: > > -- >8 -- > SIG{__DIE__} = sub { > CORE::die @_ if $^S || !defined($^S); > print STDERR "fatal: @_"; > exit 128; > }; > > eval { > die "inside eval"; > }; > print "eval st

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread demerphq
On 28 February 2018 at 08:49, Jeff King wrote: > On Wed, Feb 28, 2018 at 07:42:51AM +, Eric Wong wrote: > >> > > > a) We could override the meaning of die() in Git.pm. This feels >> > > > ugly but if it works, it would be a very small patch. >> > > >> > > Unlikely to work since I think w

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread demerphq
On 28 February 2018 at 15:55, Randall S. Becker wrote: > On February 28, 2018 2:49 AM, Peff wrote: >> On Wed, Feb 28, 2018 at 07:42:51AM +, Eric Wong wrote: >> >> > > > > a) We could override the meaning of die() in Git.pm. This feels >> > > > > ugly but if it works, it would be a very s

RE: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Randall S. Becker
On February 28, 2018 11:46 AM, demerphq wrote: > On 28 February 2018 at 08:49, Jeff King wrote: > > On Wed, Feb 28, 2018 at 07:42:51AM +, Eric Wong wrote: > > > >> > > > a) We could override the meaning of die() in Git.pm. This feels > >> > > > ugly but if it works, it would be a very sm

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread demerphq
On 28 February 2018 at 18:10, Randall S. Becker wrote: > On February 28, 2018 11:46 AM, demerphq wrote: >> On 28 February 2018 at 08:49, Jeff King wrote: >> > On Wed, Feb 28, 2018 at 07:42:51AM +, Eric Wong wrote: >> > >> >> > > > a) We could override the meaning of die() in Git.pm. This fe

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread demerphq
On 28 February 2018 at 18:19, demerphq wrote: > On 28 February 2018 at 18:10, Randall S. Becker > wrote: >> On February 28, 2018 11:46 AM, demerphq wrote: >>> On 28 February 2018 at 08:49, Jeff King wrote: >>> > On Wed, Feb 28, 2018 at 07:42:51AM +, Eric Wong wrote: >>> > >>> >> > > > a) W

[GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Alban Gruin
This adds xfuncname and word_regex patterns for golang, a quite popular programming language. It also includes test cases for the xfuncname regex (t4018) and an updated documentation. The xfuncname regex finds functions, structs and interfaces. The word_regex pattern finds identifiers, integers, f

RE: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Randall S. Becker
On February 28, 2018 12:19 PM, demerphq wrote: > On 28 February 2018 at 18:10, Randall S. Becker > wrote: > > On February 28, 2018 11:46 AM, demerphq wrote: > >> On 28 February 2018 at 08:49, Jeff King wrote: > >> > On Wed, Feb 28, 2018 at 07:42:51AM +, Eric Wong wrote: > >> > > >> >> > > >

Re: [PATCH v7 0/7] convert: add support for different encodings

2018-02-28 Thread Junio C Hamano
Jeff King writes: >> The binary patch is still supported, but that detail may need some more >> explanation >> in the commit message. Please see t4066-diff-encoding.sh > > Yeah, but if you don't have binary-patches enabled we'd generate a bogus > patch. Which, granted, without that you wouldn't

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Jonathan Nieder
Randall S. Becker wrote: > The problem is actually in git code in its test suite that uses perl > inline, not in my test code itself. The difficulty I'm having is > placing this appropriate so that the signal handler gets used > throughout the test suite including in the perl -e invocations. This

Re: [PATCH] protocol: treat unrecognized protocol.version setting as 0

2018-02-28 Thread Junio C Hamano
Jonathan Nieder writes: > If I share my .gitconfig or .git/config file between multiple machines > (or between multiple Git versions on a single machine) and set > > [protocol] > version = 2 > > then running "git fetch" with a Git version that does not support > protocol v2 er

Re: [PATCH] protocol: treat unrecognized protocol.version setting as 0

2018-02-28 Thread Junio C Hamano
Jonathan Nieder writes: >> I wonder if it's better to specify multiple versions. If v2 is not >> recognized by this git but v0 is, then it can pick that up. But if you >> explicitly tell it to choose between v2 and v3 only and it does not >> understand either, then it dies. Not sure if this is a

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Junio C Hamano
Stefan Beller writes: > This applies on top of origin/sb/object-store and is the continuation of > that series, adding the repository as a context argument to functions. Wait a minute. Is that topic ever shown to work well together with other topics in flight and are now ready to be built upon?

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Junio C Hamano
Duy Nguyen writes: > Looking at the full-series diff though, it makes me wonder if we > should keep prepare_packed_git() private (i.e. how we initialize the > object store, packfile included, is a private matter). How about > something like this on top? Yup, that looks cleaner.

Re: [PATCH] protocol: treat unrecognized protocol.version setting as 0

2018-02-28 Thread Junio C Hamano
Junio C Hamano writes: > Jonathan Nieder writes: > >>> I wonder if it's better to specify multiple versions. If v2 is not >>> recognized by this git but v0 is, then it can pick that up. But if you >>> explicitly tell it to choose between v2 and v3 only and it does not >>> understand either, then

Re: [PATCH] protocol: treat unrecognized protocol.version setting as 0

2018-02-28 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: > Jonathan Nieder writes: >> If I share my .gitconfig or .git/config file between multiple machines >> (or between multiple Git versions on a single machine) and set >> >> [protocol] >> version = 2 >> >> then running "git fetch" with a Git version that

Re: [PATCH v3 0/4] Delete ignore_env member in struct repository

2018-02-28 Thread Brandon Williams
On 02/28, Nguyễn Thái Ngọc Duy wrote: > v3 fixes comment style. Also since Brandon raised a question about > shared_root, it's obviously not a good name, so I renamed it to > commondir. Thanks, its a bit clearer and more consistent with the rest of the terminology we already have :) > > I still

Re: [PATCH] hooks/pre-auto-gc-battery: allow gc to run on non-laptops

2018-02-28 Thread Junio C Hamano
Adam Borowski writes: > Desktops and servers tend to have no power sensor, thus on_ac_power returns > 255 ("unknown"). > > If that tool returns "unknown", there's no point in querying other sources > as it already queried them, and is smarter than us (can handle multiple > adapters). The explana

RE: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Randall S. Becker
On February 28, 2018 12:44 PM, Jonathan Nieder wrote: > Randall S. Becker wrote: > > > The problem is actually in git code in its test suite that uses perl > > inline, not in my test code itself. The difficulty I'm having is > > placing this appropriate so that the signal handler gets used > > thr

Re: Reduce pack-objects memory footprint?

2018-02-28 Thread Eric Wong
Duy Nguyen wrote: > which saves 12 bytes (or another 74 MB). 222 MB total is plenty of > space to keep some file cache from being evicted. Nice! I can definitely benefit from lower memory usage when packing. Fwiw, I use pahole with other projects to help find packing opportunities: git

I Hope You Get My Message This Time

2018-02-28 Thread Friedrich Mayrhofer
-- -- This is the second time i am sending you this mail.I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

Re: [PATCH v4 04/13] commit-graph: implement write_commit_graph()

2018-02-28 Thread Junio C Hamano
Derrick Stolee writes: > diff --git a/commit-graph.h b/commit-graph.h > new file mode 100644 > index 000..dc8c73a > --- /dev/null > +++ b/commit-graph.h > @@ -0,0 +1,7 @@ > +#ifndef COMMIT_GRAPH_H > +#define COMMIT_GRAPH_H > + > +extern char *write_commit_graph(const char *obj_dir); > + > +#e

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Eric Sunshine
On Wed, Feb 28, 2018 at 12:29 PM, Alban Gruin wrote: > This adds xfuncname and word_regex patterns for golang, a quite > popular programming language. It also includes test cases for the > xfuncname regex (t4018) and an updated documentation. s/an // > The xfuncname regex finds functions, struct

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Jonathan Nieder
Randall S. Becker wrote: > On February 28, 2018 12:44 PM, Jonathan Nieder wrote: >> Randall S. Becker wrote: >>> The problem is actually in git code in its test suite that uses perl >>> inline, not in my test code itself. [...] >> Can you elaborate with an example? My understanding was that >> te

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Stefan Beller
On Wed, Feb 28, 2018 at 9:57 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> This applies on top of origin/sb/object-store and is the continuation of >> that series, adding the repository as a context argument to functions. > > Wait a minute. Is that topic ever shown to work well together

Re: [PATCH v3 0/4] Delete ignore_env member in struct repository

2018-02-28 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > v3 fixes comment style. Also since Brandon raised a question about > shared_root, it's obviously not a good name, so I renamed it to > commondir. > > I still keep the delete patch 2/4, but I move the repo_setup_env() > deletion back to 1/4 so all env logic is in on

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Stefan Beller
On Wed, Feb 28, 2018 at 9:59 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Looking at the full-series diff though, it makes me wonder if we >> should keep prepare_packed_git() private (i.e. how we initialize the >> object store, packfile included, is a private matter). How about >> somethin

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Beller writes: > >> This applies on top of origin/sb/object-store and is the continuation of >> that series, adding the repository as a context argument to functions. > > Wait a minute. Is that topic ever shown to work well together with > other topics in flight

[PATCH v2 1/5] sequencer: make lockfiles non-static

2018-02-28 Thread Martin Ågren
After 076aa2cbd (tempfile: auto-allocate tempfiles on heap, 2017-09-05), we can have lockfiles on the stack. One of these functions fails to always roll back the lock. That will be fixed in the next commit. Signed-off-by: Martin Ågren --- sequencer.c | 10 +- 1 file changed, 5 insertion

[PATCH v2 2/5] sequencer: always roll back lock in `do_recursive_merge()`

2018-02-28 Thread Martin Ågren
If we return early, we forget to roll back the lockfile. Do so. Signed-off-by: Martin Ågren --- sequencer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 90807c4559..e6bac4692a 100644 --- a/sequencer.c +++ b/sequencer.c @@ -465,8 +465,10 @

[PATCH v2 0/5] roll back locks in various code paths

2018-02-28 Thread Martin Ågren
This is v2 of my series to always release locks. As before, there's a conflict with pu, where the correct resolution is to take my version of the conflicting hunk. The only difference to v1 is in patch 3. I'll follow up with a patch to address the confusing pattern which Peff mentioned and which f

[PATCH v2 5/5] sequencer: do not roll back lockfile unnecessarily

2018-02-28 Thread Martin Ågren
If `commit_lock_file()` or `hold_lock_file_for_update()` fail, there is no need to call `rollback_lock_file()` on the lockfile. It doesn't hurt either, but it does make different callers in this file inconsistent, which might be confusing. While at it, remove a trailing '.' from a recurring error

[PATCH v2 4/5] merge: always roll back lock in `checkout_fast_forward()`

2018-02-28 Thread Martin Ågren
This function originated in builtin/merge.c. It was moved to merge.c in commit db699a8a1f (Move try_merge_command and checkout_fast_forward to libgit.a, 2012-10-26), but was used from sequencer.c even before that. If a problem occurs, the function returns without rolling back the lockfile. Teach i

[PATCH v2 3/5] merge-recursive: always roll back lock in `merge_recursive_generic()`

2018-02-28 Thread Martin Ågren
If we return early, or if `active_cache_changed` is false, we forget to roll back the lockfile. Signed-off-by: Martin Ågren --- merge-recursive.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index cc5fa0a949..002fb82cf1 100644 ---

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Stefan Beller
On Wed, Feb 28, 2018 at 11:02 AM, Junio C Hamano wrote: > OK, so I finally picked up the last round, which wasn't even in my > private build. I had the previous round but hadn't convinced myself > that my conflict resolution with other topics in flight that were > still mushy was correct, so it

Re: [PATCH v3 28/35] transport-helper: introduce stateless-connect

2018-02-28 Thread Brandon Williams
On 02/27, Jonathan Nieder wrote: > Brandon Williams wrote: > > > Introduce the transport-helper capability 'stateless-connect'. This > > capability indicates that the transport-helper can be requested to run > > the 'stateless-connect' command which should attempt to make a > > stateless connecti

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

2018-02-28 Thread Igor Djordjevic
Hi Sergey, On 28/02/2018 06:21, Sergey Organov wrote: > > > > > > (3) ---X1---o---o---o---o---o---X2 > > > > >|\ |\ > > > > >| A1---A2---A3---U1 | A1'--A2'--A3'--U1' > > > > >| \ | > > > > >| M |

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Junio C Hamano
Stefan Beller writes: > On Wed, Feb 28, 2018 at 9:59 AM, Junio C Hamano wrote: >> Duy Nguyen writes: >> >>> Looking at the full-series diff though, it makes me wonder if we >>> should keep prepare_packed_git() private (i.e. how we initialize the >>> object store, packfile included, is a private

I wait for your prompt response.

2018-02-28 Thread SAM AZADA
Good day, I am Mr. Sam Azada from Burkina Faso a Minister confide on me to look for foreign partner who will assist him to invest the sum of Fifty Million Dollars ($50,000,000) in your country. He has investment interest in mining, exotic properties for commercial resident, development proper

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

2018-02-28 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > On Wed, Feb 28, 2018 at 9:57 AM, Junio C Hamano wrote: >> Wait a minute. Is that topic ever shown to work well together with >> other topics in flight and are now ready to be built upon? I had an >> impression that it is just starting to get serious reviews. > > And

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

2018-02-28 Thread Igor Djordjevic
Hi Sergey, On 28/02/2018 06:44, Sergey Organov wrote: > > > > Here`s our starting position: > > > > > > (0) ---X1---o---o---o---o---o---X2 (master) > > >|\ > > >| A1---A2---A3 > > >| \ > > >| M (topic) > > >| / > > >

Re: [PATCH v2 0/5] roll back locks in various code paths

2018-02-28 Thread Martin Ågren
> I'll follow up with a patch to > address the confusing pattern which Peff mentioned and which fooled me > when I prepared v1. Here is such a patch on top of the others. I'm not particularly proud of the name SKIP_IF_UNCHANGED, but don't think it's any worse than, e.g., IGNORE_UNCHANGED or NO_UNC

RE: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Randall S. Becker
On February 28, 2018 1:52 PM, Jonathan Nieder wrote: > Randall S. Becker wrote: > > On February 28, 2018 12:44 PM, Jonathan Nieder wrote: > >> Randall S. Becker wrote: > > >>> The problem is actually in git code in its test suite that uses perl > >>> inline, not in my test code itself. > [...] > >

Re: [PATCH v3 34/35] remote-curl: implement stateless-connect command

2018-02-28 Thread Brandon Williams
On 02/27, Jonathan Nieder wrote: > Hi, > > Brandon Williams wrote: > > > Teach remote-curl the 'stateless-connect' command which is used to > > establish a stateless connection with servers which support protocol > > version 2. This allows remote-curl to act as a proxy, allowing the git > > clie

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

2018-02-28 Thread Igor Djordjevic
Hi Sergey, On 28/02/2018 06:19, Sergey Organov wrote: > > > > (3) ---X1---o---o---o---o---o---X2 > > >|\ |\ > > >| A1---A2---A3---U1 | A1'--A2'--A3'--U1' > > >| \ | > > >| M | > > >|

Re: [PATCH v7 0/7] convert: add support for different encodings

2018-02-28 Thread Lars Schneider
> On 27 Feb 2018, at 22:25, Jeff King wrote: > > On Tue, Feb 27, 2018 at 10:05:17PM +0100, Torsten Bögershausen wrote: > > Of the three solutions, I think the relative merits are something like > this: > > 1. baked-in textconv (my patch) > > - reuses an existing diff feature, so minimal

Re: [PATCH v2] sha1_name: fix uninitialized memory errors

2018-02-28 Thread Junio C Hamano
Derrick Stolee writes: > diff --git a/sha1_name.c b/sha1_name.c > index 611c7d24dd..a041d8d24f 100644 > --- a/sha1_name.c > +++ b/sha1_name.c > @@ -547,15 +547,15 @@ static void find_abbrev_len_for_pack(struct packed_git > *p, >*/ > mad->init_len = 0; > if (!match) { > -

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

2018-02-28 Thread Igor Djordjevic
Hi Sergey, On 28/02/2018 07:14, Sergey Organov wrote: > > > > Would additional step as suggested in [1] (using R1 and R2 to "catch" > > > interactive rebase additions/amendments/drops, on top of U1' and > > > U2'), make more sense (or provide an additional clue, at least)? > > > > > > [1] > >

Re: [PATCH v2] sha1_name: fix uninitialized memory errors

2018-02-28 Thread Derrick Stolee
On 2/28/2018 3:50 PM, Junio C Hamano wrote: Derrick Stolee writes: diff --git a/sha1_name.c b/sha1_name.c index 611c7d24dd..a041d8d24f 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -547,15 +547,15 @@ static void find_abbrev_len_for_pack(struct packed_git *p, */ mad->init_len =

Re: [PATCH v2] sha1_name: fix uninitialized memory errors

2018-02-28 Thread Junio C Hamano
Derrick Stolee writes: >> I do not think they are wrong, but aren't the latter two somewhat >> redundant? "num" is p->num_objects, and we call (first+1)th element >> only after we see (first < num - 1), i.e. first+1 < num, and the >> access to (first-1)th is done only when first > 0. The first

Re: [PATCH v8 5/7] convert: add 'working-tree-encoding' attribute

2018-02-28 Thread Eric Sunshine
On Tue, Feb 27, 2018 at 6:16 AM, Lars Schneider wrote: >> On 25 Feb 2018, at 08:15, Eric Sunshine wrote: >> On Sat, Feb 24, 2018 at 11:27 AM, wrote: >> The above paragraph is giving an example of the scenario described in >> the paragraph above it. It might, therefore, be clearer to start this

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

2018-02-28 Thread Junio C Hamano
Jeff King writes: > A minor nit, but please use something like: > > if (git_env_bool("GIT_TEST_UNTRACKED_CACHE", 0) && ... > > so that: > > GIT_TEST_UNTRACKED_CACHE=false > > does what one might expect, and not the opposite. > > Two other thoughts: > > - it may be worth memo-izing it with a

Obsolete instruction in SubmittingPatches?

2018-02-28 Thread Andrei Rybak
Hello, It seems to me that this part of Documentation/SubmittingPatches is not actual nowadays: After the list reached a consensus that it is a good idea to apply the patch, re-send it with "To:" set to the maintainer{1} and "cc:" the list{2} for inclusion. >From what I observe in the mail

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Alban Gruin
>> diff --git a/userdiff.c b/userdiff.c >> @@ -38,6 +38,15 @@ IPATTERN("fortran", >> +PATTERNS("golang", >> +/* Functions */ >> +"^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n" > > Why is the brace (and possible following whitespace) optional? > Considering that the language demands that the

Re: [PATCH v8 3/7] utf8: add function to detect prohibited UTF-16/32 BOM

2018-02-28 Thread Lars Schneider
> On 27 Feb 2018, at 06:17, Eric Sunshine wrote: > > On Sun, Feb 25, 2018 at 6:35 AM, Lars Schneider > wrote: >>> On 25 Feb 2018, at 04:41, Eric Sunshine wrote: >>> Is this interpretation correct? When I read [1], I interpret it as >>> saying that no BOM _of any sort_ should be present when th

Re: [PATCH] hooks/pre-auto-gc-battery: allow gc to run on non-laptops

2018-02-28 Thread Adam Borowski
On Wed, Feb 28, 2018 at 10:16:21AM -0800, Junio C Hamano wrote: > Adam Borowski writes: > > > Desktops and servers tend to have no power sensor, thus on_ac_power returns > > 255 ("unknown"). > > > > If that tool returns "unknown", there's no point in querying other sources > > as it already queri

Re: Obsolete instruction in SubmittingPatches?

2018-02-28 Thread Junio C Hamano
Andrei Rybak writes: > Is this part of guidelines obsolete, or am I not understanding this > correctly? I am merely being nice (but only on "time-permitting" basis).

Re: [PATCH] hooks/pre-auto-gc-battery: allow gc to run on non-laptops

2018-02-28 Thread Junio C Hamano
Adam Borowski writes: > 0 usually means a laptop on AC power, 255 is for a typical desktop. > The current code can't return 2 or any other unexpected value, but if it > ever does, an unknown error should probably be treated same as 255 unknown. > Thus, gc should be avoided only if the return code

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Eric Sunshine
On Wed, Feb 28, 2018 at 4:31 PM, Alban Gruin wrote: >>> diff --git a/userdiff.c b/userdiff.c >>> @@ -38,6 +38,15 @@ IPATTERN("fortran", >>> +PATTERNS("golang", >>> +/* Functions */ >>> +"^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n" >> >> Why is the brace (and possible following whitespace)

RE: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Randall S. Becker
On February 28, 2018 3:04 PM, Jonathan Nieder wrote: > On February 28, 2018 1:52 PM, Jonathan Nieder wrote: > > Randall S. Becker wrote: > > > On February 28, 2018 12:44 PM, Jonathan Nieder wrote: > > >> Randall S. Becker wrote: > > > > >>> The problem is actually in git code in its test suite that

[PATCH v2] hooks/pre-auto-gc-battery: allow gc to run on non-laptops

2018-02-28 Thread Adam Borowski
Desktops and servers tend to have no power sensor, thus on_ac_power returns 255 ("unknown"). Thus, let's take any answer other than 1 ("battery") as no contraindication to run gc. If that tool returns "unknown", there's no point in querying other sources as it already queried them, and is smarter

[PATCH] commit: run git gc --auto just before the pre-commit hook

2018-02-28 Thread Ævar Arnfjörð Bjarmason
Change the behavior of git-commit back to what it was back in d4bb43ee27 ("Invoke "git gc --auto" from commit, merge, am and rebase.", 2007-09-05) when it was git-commit.sh. Shortly afterwards in f5bbc3225c ("Port git commit to C.", 2007-11-08) when it was ported to C the "git gc --auto" invocatio

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

2018-02-28 Thread Igor Djordjevic
On 28/02/2018 21:25, Igor Djordjevic wrote: > > But U1' and U2' are really to be expected to stay the same in > non-interactive rebase case only... Just to rephrase to "could be expected" here, meaning still not necessarily in this case, either - I`ve just witnessed non-interactive rebase Joha

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Alban Gruin
Le 28/02/2018 à 23:00, Eric Sunshine a écrit : > On Wed, Feb 28, 2018 at 4:31 PM, Alban Gruin wrote: diff --git a/userdiff.c b/userdiff.c @@ -38,6 +38,15 @@ IPATTERN("fortran", +PATTERNS("golang", +/* Functions */ +"^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n" >>>

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Eric Sunshine
On Wed, Feb 28, 2018 at 5:17 PM, Alban Gruin wrote: > Yes, but I can split the line like that: > > % cat >baz.go<<\EOF > package baz > func baz(arg1 int64, > arg2 int64) { > } > EOF > % go build baz.go > > This complies to the standard formatting (at least, gofmt do

Re: [PATCH v2] hooks/pre-auto-gc-battery: allow gc to run on non-laptops

2018-02-28 Thread Junio C Hamano
Adam Borowski writes: > Desktops and servers tend to have no power sensor, thus on_ac_power returns > 255 ("unknown"). Thus, let's take any answer other than 1 ("battery") as > no contraindication to run gc. > > If that tool returns "unknown", there's no point in querying other sources > as it a

Re: [PATCH] commit: run git gc --auto just before the pre-commit hook

2018-02-28 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Change the behavior of git-commit back to what it was back in > d4bb43ee27 ("Invoke "git gc --auto" from commit, merge, am and > rebase.", 2007-09-05) when it was git-commit.sh. ... which was to run it just before post-commit. Do I retitle this patch before qu

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Junio C Hamano
Eric Sunshine writes: > On Wed, Feb 28, 2018 at 5:17 PM, Alban Gruin wrote: >> Yes, but I can split the line like that: >> >> % cat >baz.go<<\EOF >> package baz >> func baz(arg1 int64, >> arg2 int64) { >> } >> EOF >> % go build baz.go >> >> This complies to the st

Re: [GSoC][PATCH] userdiff: add built-in pattern for golang

2018-02-28 Thread Alban Gruin
Le 28/02/2018 à 23:32, Junio C Hamano a écrit : > Eric Sunshine writes: > >> On Wed, Feb 28, 2018 at 5:17 PM, Alban Gruin wrote: >>> Yes, but I can split the line like that: >>> >>> % cat >baz.go<<\EOF >>> package baz >>> func baz(arg1 int64, >>> arg2 int64) { >>> } >>>

[PATCH v2] commit: run git gc --auto just before the pre-commit hook

2018-02-28 Thread Ævar Arnfjörð Bjarmason
Change the behavior of git-commit back to what it was back in d4bb43ee27 ("Invoke "git gc --auto" from commit, merge, am and rebase.", 2007-09-05) when it was git-commit.sh. Shortly afterwards in f5bbc3225c ("Port git commit to C.", 2007-11-08) when it was ported to C, the "git gc --auto" invocati

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

2018-02-28 Thread Jonathan Nieder
Randall S. Becker wrote: > The original thread below has details of what the original issue was and > why. It hit three tests specifically on this platform where die was invoked > (at least on one of them). Perl was invoked under the covers and the > completion code of 169 propagated back through

Re: [PATCH v2 0/5] roll back locks in various code paths

2018-02-28 Thread Junio C Hamano
Martin Ågren writes: > A further upshot of this patch is that `active_cache_changed`, which is > defined as `the_index.cache_changed`, now only has a few users left. I am undecided if this is a *good* thing. In a few codepaths where we make a speculative update to the on-disk index file, I find

  1   2   >