Help

2018-04-30 Thread Senoir Aeron
Account been flagged How to repair nLiz

Re: [PATCH 31/41] wt-status: convert two uses of EMPTY_TREE_SHA1_HEX

2018-04-30 Thread brian m. carlson
On Tue, Apr 24, 2018 at 12:03:35PM +0200, Martin Ågren wrote: > Just a thought: Maybe it would make sense to have a function > `oid_hex_empty_tree()` or similar to replace the > oid_to_hex[_r](the_hash_algo->empty_tree) idiom. It would help avoid the > buffer here, but also get rid of a few

Re: [PATCH] format-patch: make cover letters always text/plain

2018-04-30 Thread Eric Sunshine
On Mon, Apr 30, 2018 at 8:02 PM, brian m. carlson wrote: > When formatting a series of patches using --attach and --cover-letter, > the cover letter lacks the closing MIME boundary, violating RFC 2046. > Certain clients, such as Thunderbird, discard the message body

Re: [PATCH 0/9] get_short_oid UI improvements

2018-04-30 Thread brian m. carlson
On Mon, Apr 30, 2018 at 10:07:25PM +, Ævar Arnfjörð Bjarmason wrote: > I started out just wanting to do 04/09 so I'd get prettier output, but > then noticed that ^{tag}, ^{commit}< ^{blob} and ^{tree} didn't behave > as expected with the disambiguation output, and that core.disambiguate > had

Re: [PATCH 7/9] get_short_oid / peel_onion: ^{tree} should mean tree, not treeish

2018-04-30 Thread brian m. carlson
On Mon, Apr 30, 2018 at 10:07:32PM +, Ævar Arnfjörð Bjarmason wrote: > diff --git a/sha1-name.c b/sha1-name.c > index 023f9471a8..b61c0558d9 100644 > --- a/sha1-name.c > +++ b/sha1-name.c > @@ -970,7 +970,7 @@ static int peel_onion(const char *name, int len, struct > object_id *oid, >

[PATCH] format-patch: make cover letters always text/plain

2018-04-30 Thread brian m. carlson
When formatting a series of patches using --attach and --cover-letter, the cover letter lacks the closing MIME boundary, violating RFC 2046. Certain clients, such as Thunderbird, discard the message body in such a case. Since the cover letter is just one part and sending it as multipart/mixed is

Re: [PATCH 00/41] object_id part 13

2018-04-30 Thread brian m. carlson
On Mon, Apr 30, 2018 at 08:03:12PM +0200, Duy Nguyen wrote: > On Tue, Apr 24, 2018 at 1:39 AM, brian m. carlson > wrote: > > [0] I can synthesize blobs, trees, and commits, but things are currently > > totally broken, which is, I suppose, to be expected. > > Yup. I

Re: [PATCH v4 10/10] commit-graph.txt: update design document

2018-04-30 Thread Jakub Narebski
Derrick Stolee writes: > We now calculate generation numbers in the commit-graph file and use > them in paint_down_to_common(). > > Expand the section on generation numbers to discuss how the three > special generation numbers GENERATION_NUMBER_INFINITY, _ZERO, and > _MAX

Re: [PATCH 8/9] get_short_oid / peel_onion: ^{tree} should mean commit, not commitish

2018-04-30 Thread Eric Sunshine
On Mon, Apr 30, 2018 at 6:07 PM, Ævar Arnfjörð Bjarmason wrote: > get_short_oid / peel_onion: ^{tree} should mean commit, not commitish s/tree/commit/ > Continue the untangling of peel disambiguation syntax. Before this > e8f2^{commit} would show the v2.17.0 tag, but now it'll

Re: [PATCH v4 09/10] merge: check config before loading commits

2018-04-30 Thread Jakub Narebski
Derrick Stolee writes: > Now that we use generation numbers from the commit-graph, we must > ensure that all commits that exist in the commit-graph are loaded > from that file instead of from the object database. Since the > commit-graph file is only checked if

Re: [PATCH 0/9] get_short_oid UI improvements

2018-04-30 Thread Stefan Beller
On Mon, Apr 30, 2018 at 3:07 PM, Ævar Arnfjörð Bjarmason wrote: > I started out just wanting to do 04/09 so I'd get prettier output, but > then noticed that ^{tag}, ^{commit}< ^{blob} and ^{tree} didn't behave > as expected with the disambiguation output, and that

Re: [PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Avery Pennarun
On Mon, Apr 30, 2018 at 6:21 PM, Ævar Arnfjörð Bjarmason wrote: > Pretty clear it's garbage data, unless we're to believe that the > relative interest of submodules in the US, Germany and Sweden is 51, 64 > & 84, but 75, 100 and 0 for subtree. Oh yeah, Swedish people hate

Re: [PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 30 2018, Avery Pennarun wrote: > On Mon, Apr 30, 2018 at 5:38 PM, Stefan Beller wrote: > There's one exception, which is doing a one-time permanent merge of > two projects into one. That's a nice feature, but is probably used > extremely rarely. FWIW this is

Re: [PATCH v4 08/10] commit: add short-circuit to paint_down_to_common()

2018-04-30 Thread Jakub Narebski
Derrick Stolee writes: > When running 'git branch --contains', the in_merge_bases_many() > method calls paint_down_to_common() to discover if a specific > commit is reachable from a set of branches. Commits with lower > generation number are not needed to correctly answer

Re: [PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Stefan Beller
On Mon, Apr 30, 2018 at 2:53 PM, Avery Pennarun wrote: > For the best of both worlds, I've often thought that a good balance > would be to use the same data structure that submodule uses, but to > store all the code in a single git repo under different refs, which we > might

[PATCH 7/9] get_short_oid / peel_onion: ^{tree} should mean tree, not treeish

2018-04-30 Thread Ævar Arnfjörð Bjarmason
After the recent series of patches ^{tag} and ^{blob} now work to get just the tags and blobs, but ^{tree} will still list any tree-ish (commits, tags and trees). The previous behavior was added in ed1ca6025f ("peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish",

Good News

2018-04-30 Thread Mrs Julie Leach
You are a recipient to Mrs Julie Leach Donation of $2 million USD. Contact (julieleach...@gmail.com) for claims.

[PATCH 2/9] sha1-array.h: align function arguments

2018-04-30 Thread Ævar Arnfjörð Bjarmason
The arguments weren't lined up with the opening parenthesis. Fixes up code added in cff38a5e11 ("receive-pack: eliminate duplicate .have refs", 2011-05-19). Signed-off-by: Ævar Arnfjörð Bjarmason --- sha1-array.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[PATCH 9/9] config doc: document core.disambiguate

2018-04-30 Thread Ævar Arnfjörð Bjarmason
The core.disambiguate variable was added in 5b33cb1fd7 ("get_short_sha1: make default disambiguation configurable", 2016-09-27) but never documented. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 14 ++ 1 file changed, 14 insertions(+) diff

[PATCH 8/9] get_short_oid / peel_onion: ^{tree} should mean commit, not commitish

2018-04-30 Thread Ævar Arnfjörð Bjarmason
Continue the untangling of peel disambiguation syntax. Before this e8f2^{commit} would show the v2.17.0 tag, but now it'll just show ambiguous commits: $ git rev-parse e8f2^{commit} error: short SHA1 e8f2 is ambiguous hint: The candidates are: hint: e8f21caf94 commit 2013-06-24

[PATCH 5/9] get_short_oid: learn to disambiguate by ^{tag}

2018-04-30 Thread Ævar Arnfjörð Bjarmason
Add support for ^{tag} to the disambiguation logic. Before this ^{tag} would simply be ignored: $ git rev-parse e8f2^{tag} error: short SHA1 e8f2 is ambiguous hint: The candidates are: hint: e8f2650052 tag v2.17.0 hint: e8f21caf94 commit 2013-06-24 - bash prompt: print

[PATCH 6/9] get_short_oid: learn to disambiguate by ^{blob}

2018-04-30 Thread Ævar Arnfjörð Bjarmason
The disambiguation logic had all the pieces necessary to only print out those blobs that were ambiguous, but they hadn't been connected. The initial logic was added in daba53aeaf ("sha1_name.c: add support for disambiguating other types", 2012-07-02), and when the flags were propagated in

[PATCH 1/9] sha1-name.c: remove stray newline

2018-04-30 Thread Ævar Arnfjörð Bjarmason
This stray newline was accidentally introduced in d2b7d9c7ed ("sha1_name: convert disambiguate_hint_fn to take object_id", 2017-03-26). Signed-off-by: Ævar Arnfjörð Bjarmason --- sha1-name.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sha1-name.c b/sha1-name.c index

[PATCH 0/9] get_short_oid UI improvements

2018-04-30 Thread Ævar Arnfjörð Bjarmason
I started out just wanting to do 04/09 so I'd get prettier output, but then noticed that ^{tag}, ^{commit}< ^{blob} and ^{tree} didn't behave as expected with the disambiguation output, and that core.disambiguate had never been documented. Ævar Arnfjörð Bjarmason (9): sha1-name.c: remove stray

[PATCH 4/9] get_short_oid: sort ambiguous objects by type, then SHA-1

2018-04-30 Thread Ævar Arnfjörð Bjarmason
Change the output emitted when an ambiguous object is encountered so that we show tags first, then commits, followed by trees, and finally blobs. Within each type we show objects in hashcmp(). Before this change the objects were only ordered by hashcmp(). The reason for doing this is that the

[PATCH 3/9] sha1-name.c: move around the collect_ambiguous() function

2018-04-30 Thread Ævar Arnfjörð Bjarmason
A subsequent change will make use of this static function in the get_short_oid() function, which is defined above where the collect_ambiguous() function is now, which would result in a compilation error due to a forward declaration. Signed-off-by: Ævar Arnfjörð Bjarmason ---

Re: [PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Avery Pennarun
On Mon, Apr 30, 2018 at 5:38 PM, Stefan Beller wrote: > On Mon, Apr 30, 2018 at 1:45 PM, Avery Pennarun wrote: > No objections from me either. > > Submodules seem to serve a slightly different purpose, though? I think the purpose is actually the same -

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

2018-04-30 Thread Stefan Beller
On Mon, Apr 30, 2018 at 8:31 AM, Jameson Miller wrote: > Adds the following functionality to memory pools: > > - Lifecycle management functions (init, discard) > > - Test whether a memory location is part of the managed pool > > - Function to combine 2 pools > > This also

Proposal

2018-04-30 Thread Miss Zeliha Omer Faruk
Hello Greetings to you today i asked before but i did't get a response please i know this might come to you as a surprise because you do not know me personally i have a business proposal for our mutual benefit please let me know if you are interested. Best Regards, Esentepe Mahallesi

Re: git-submodule is missing --dissociate option

2018-04-30 Thread Casey Fitzpatrick
Sure, I'll take a crack at it and submit a patch. On Mon, Apr 30, 2018 at 2:19 PM, Stefan Beller wrote: > On Mon, Apr 30, 2018 at 1:29 AM, Casey Fitzpatrick wrote: >> This seems to be a hole in the git feature set. I believe it is fairly >> easily worked

Re: [PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Stefan Beller
On Mon, Apr 30, 2018 at 1:45 PM, Avery Pennarun wrote: > On Mon, Apr 30, 2018 at 5:50 AM, Ævar Arnfjörð Bjarmason > wrote: >> I think at this point git-subtree is widely used enough to move out of >> contrib/, maybe others disagree, but patches are always

Proposal

2018-04-30 Thread Miss Zeliha Omer Faruk
Hello Greetings to you today i asked before but i did't get a response please i know this might come to you as a surprise because you do not know me personally i have a business proposal for our mutual benefit please let me know if you are interested. Best Regards, Esentepe Mahallesi

[PATCH] revisions.txt: expand tabs to spaces in diagram

2018-04-30 Thread Martin Ågren
The diagram renders fine in AsciiDoc before and after this patch. Asciidoctor, on the other hand, ignores the tabs entirely, which results in different indentation for different lines. The graph illustration earlier in the document already uses spaces instead of a tab. Signed-off-by: Martin Ågren

Re: [PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Avery Pennarun
On Mon, Apr 30, 2018 at 5:50 AM, Ævar Arnfjörð Bjarmason wrote: > I think at this point git-subtree is widely used enough to move out of > contrib/, maybe others disagree, but patches are always better for > discussion that patch-less ML posts. I really was hoping git-subtree

Re: [PATCH 1/1] wt-status: use rename settings from init_diff_ui_defaults

2018-04-30 Thread Elijah Newren
Hi Eckhard, On Mon, Apr 30, 2018 at 2:34 AM, Eckhard S. Maaß wrote: > Since the very beginning, git status behaved differently for rename > detection than other rename aware commands like git log or git show as > it has the use of rename hard coded into it. After

RE: Branch deletion question / possible bug?

2018-04-30 Thread Tang (US), Pik S
Hello, Thank you for all your replies. I am on a case insensitive system (Windows 10) running git version 2.14.1.windows.1. While I can't comment on what the fix would be, it has been enlightening to learn a bit more about what's under the cover of git. TIL :) Pik -Original

Account Receivables (Job Offer)

2018-04-30 Thread Yokohama Rubber Company
-- We are interested in employing you to represent our company in the United States and Canada for the position of a Collection Agent to our Company Yokohama Rubber Company Limited Japan, you will be on a 20% commission for the amount owed and collected on our behalf from our customers,

Re: [PATCH 2/6] t1406: prepare for the refs code to fail with BUG()

2018-04-30 Thread Johannes Sixt
Am 30.04.2018 um 00:17 schrieb Johannes Schindelin: t1406 specifically verifies that certain code paths fail with a BUG: ... message. In the upcoming commit, we will convert that message to be generated via BUG() instead of die("BUG: ..."), which implies SIGABRT instead of a regular exit code.

Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation

2018-04-30 Thread Johannes Sixt
Am 30.04.2018 um 16:26 schrieb Ben Peart: @@ -82,8 +83,6 @@ static int cmd_dropcaches(void) { HANDLE hProcess = GetCurrentProcess(); HANDLE hToken; - HMODULE ntdll; - DWORD(WINAPI *NtSetSystemInformation)(INT, PVOID, ULONG); SYSTEM_MEMORY_LIST_COMMAND

js/no-pager-shorthand [was: What's cooking in git.git (Apr 2018, #04; Mon, 30)]

2018-04-30 Thread Johannes Sixt
Am 30.04.2018 um 05:25 schrieb Junio C Hamano: * js/no-pager-shorthand (2018-04-25) 1 commit - git: add -N as a short option for --no-pager "git --no-pager cmd" did not have short-and-sweet single letter option. Now it does. Will merge to 'next'. I consider your argument that -N is

Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation

2018-04-30 Thread Ben Peart
On 4/30/2018 2:12 PM, Stefan Beller wrote: On Mon, Apr 30, 2018 at 7:26 AM, Ben Peart wrote: Take advantage of the recent addition of support for lazy loading functions Care to specify "recent additions"? Are these in Git code or somewhere else? I find this alias

Re: git-submodule is missing --dissociate option

2018-04-30 Thread Stefan Beller
On Mon, Apr 30, 2018 at 1:29 AM, Casey Fitzpatrick wrote: > This seems to be a hole in the git feature set. I believe it is fairly > easily worked around, but it would be best to provide the option for > ease of use (and maybe performance?). > > git clone has both a --reference

Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation

2018-04-30 Thread Stefan Beller
On Mon, Apr 30, 2018 at 7:26 AM, Ben Peart wrote: > Take advantage of the recent addition of support for lazy loading functions Care to specify "recent additions"? Are these in Git code or somewhere else? I find this alias handy, as then I can describe commits in commit

Re: [PATCH 00/41] object_id part 13

2018-04-30 Thread Duy Nguyen
On Tue, Apr 24, 2018 at 1:39 AM, brian m. carlson wrote: > [0] I can synthesize blobs, trees, and commits, but things are currently > totally broken, which is, I suppose, to be expected. Yup. I was tired and bored so I went playing with the new hash. Writing and

Re: git merge banch w/ different submodule revision

2018-04-30 Thread Heiko Voigt
On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Beller wrote: > Stefan wrote: > > See > > https://github.com/git/git/commit/68d03e4a6e448aa557f52adef92595ac4d6cd4bd > > (68d03e4a6e (Implement automatic fast-forward merge for submodules, > > 2010-07-07) > > to explain the situation you

Re: [PATCH v4 07/10] commit: use generation numbers for in_merge_bases()

2018-04-30 Thread Jakub Narebski
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 branch > algorithm is computing merge bases. >

Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation

2018-04-30 Thread Eric Sunshine
On Mon, Apr 30, 2018 at 10:26 AM, Ben Peart wrote: > Take advantage of the recent addition of support for lazy loading functions > on Windows to simplfy the loading of NtSetSystemInformation. s/simplfy/simplify/ > Signed-off-by: Ben Peart

Re: [PATCH v3 2/3] merge: Add merge.renames config setting

2018-04-30 Thread Elijah Newren
Hi Eckhard, On Mon, Apr 30, 2018 at 1:03 AM, Eckhard Maaß wrote: > On Fri, Apr 27, 2018 at 01:23:20PM -0700, Elijah Newren wrote: >> I doubt it has ever been discussed before this thread. But, if you're >> curious, I'll try to dump a few thoughts. > > Thank you,

Re: public-inbox.org down?

2018-04-30 Thread Eric Wong
Oops, some upgrades went awry for the non-Tor HTTPS endpoint termination. The Tor .onions should remain available if that happens http://ou63pmih66umazou.onion/git http://czquwvybam4bgbro.onion/git http://hjrcffqmbrq6wope.onion/git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git

Re: public-inbox.org down?

2018-04-30 Thread Stefan Beller
Hi Samuel, public-inbox.org is reachable from here, which may not add a lot of information to your debugging. I cc'd Eric Wong, who runs the infrastructure of public-inbox.org, so he knows of your problem. Stefan On Mon, Apr 30, 2018 at 8:59 AM, Samuel Lijin wrote: > DNS

Re: [PATCH v4 06/10] ref-filter: use generation number for --contains

2018-04-30 Thread Jakub Narebski
Derrick Stolee writes: > A commit A can reach a commit B only if the generation number of A > is strictly larger than the generation number of B. This condition > allows significantly short-circuiting commit-graph walks. > > Use generation number for '--contains' type

Re: [PATCH v3] unpack_trees: fix breakage when o->src_index != o->dst_index

2018-04-30 Thread Duy Nguyen
On Mon, Apr 30, 2018 at 6:19 PM, Elijah Newren wrote: > Hi Duy, > > On Mon, Apr 30, 2018 at 7:45 AM, Duy Nguyen wrote: >> On Mon, Apr 30, 2018 at 4:42 PM, Duy Nguyen wrote: >>> On Sun, Apr 29, 2018 at 10:53 PM, Johannes Schindelin >>>

Re: [PATCH v3] unpack_trees: fix breakage when o->src_index != o->dst_index

2018-04-30 Thread Elijah Newren
Hi Duy, On Mon, Apr 30, 2018 at 7:45 AM, Duy Nguyen wrote: > On Mon, Apr 30, 2018 at 4:42 PM, Duy Nguyen wrote: >> On Sun, Apr 29, 2018 at 10:53 PM, Johannes Schindelin >> wrote: > @@ -1412,12 +1422,13 @@ int

Re:

2018-04-30 Thread Elijah Newren
On Mon, Apr 30, 2018 at 6:11 AM, Ben Peart wrote: > On 4/27/2018 2:19 PM, Elijah Newren wrote: >> >> From: Elijah Newren >> >> On Thu, Apr 26, 2018 at 5:54 PM, Ben Peart wrote: >> >>> Can you write the documentation that clearly explains

public-inbox.org down?

2018-04-30 Thread Samuel Lijin
DNS lookup is working but the website (possibly the server) seems to be down. The TLS handshake is never acked: $ curl -v https://public-inbox.org * Rebuilt URL to: https://public-inbox.org/ * Trying 64.71.152.64... * TCP_NODELAY set * Connected to public-inbox.org (64.71.152.64) port 443 (#0)

[PATCH v2 2/2] wt-status: const-ify all printf helper methods

2018-04-30 Thread Samuel Lijin
Change the method signatures of all printf helper methods to take a `const struct wt_status *` rather than a `struct wt_status *`. Signed-off-by: Samuel Lijin --- wt-status.c | 18 +- wt-status.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-)

[PATCH v2 1/2] commit: fix --short and --porcelain options

2018-04-30 Thread Samuel Lijin
Mark the commitable flag in the wt_status object in the call to `wt_status_collect()`, instead of in `wt_longstatus_print_updated()`, and simplify the logic in the latter function to take advantage of the logic shifted to the former. This means that callers do not need to use

[PATCH v2 0/2] Fix --short and --porcelain options for commit

2018-04-30 Thread Samuel Lijin
Rerolling patch series to fix t7501. Samuel Lijin (2): commit: fix --short and --porcelain options wt-status: const-ify all printf helper methods t/t7501-commit.sh | 4 ++-- wt-status.c | 56 ++- wt-status.h | 4 ++-- 3 files

Re: [PATCH v5 00/10] Keep all info in command-list.txt in git binary

2018-04-30 Thread Duy Nguyen
This is probably scope creep for this series, but do you guys think we should do the same for config variables completion? We currently maintain a giant list at the end of _git_config(). Extracting the list from Documentation/config.txt to keep it in a C array does not look super hard. There will

Re: [PATCH v1 1/1] test: Correct detection of UTF8_NFD_TO_NFC for APFS

2018-04-30 Thread Elijah Newren
On Mon, Apr 30, 2018 at 8:41 AM, Torsten Bögershausen wrote: > On 30.04.18 17:33, Elijah Newren wrote: > >> On Sun, Apr 29, 2018 at 11:35 PM, wrote: >>> From: Torsten Bögershausen >>> >>> @@ -1106,12 +1106,7 @@ test_lazy_prereq UTF8_NFD_TO_NFC ' >>

Re: [PATCH v5 0/5] Convert some stash functionality to a builtin

2018-04-30 Thread Joel Teichroeb
Re-sending, but this time in plain text (why doesn't gmail for android support that...) On Mon, Apr 30, 2018 at 7:35 AM, Joel Teichroeb wrote: > Hi Paul, > > That sounds great to me! > > Thanks, > Joel > > > On Sat, Apr 28, 2018, 3:06 PM Paul-Sebastian Ungureanu >

Re: [PATCH v1 1/1] test: Correct detection of UTF8_NFD_TO_NFC for APFS

2018-04-30 Thread Torsten Bögershausen
On 30.04.18 17:33, Elijah Newren wrote: > Hi, > > On Sun, Apr 29, 2018 at 11:35 PM, wrote: >> From: Torsten Bögershausen >> >> On HFS (which is the default Mac filesystem prior to High Sierra), >> unicode names are "decomposed" before recording. >> On APFS, which

[PATCH] doc: keep first level section header in upper case

2018-04-30 Thread Nguyễn Thái Ngọc Duy
When formatted as a man page, 1st section header is always in upper case even if we write it otherwise. Make all 1st section headers uppercase to keep it close to the final output. This does affect html since case is kept there, but I still think it's a good idea to maintain a consistent style

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-04-30 Thread SZEDER Gábor
On Mon, Apr 30, 2018 at 5:25 AM, Junio C Hamano wrote: > * js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits > - rebase --skip: clean up commit message after a failed fixup/squash > - sequencer: always commit without editing when asked for > - rebase -i:

Re: [PATCH v1 1/1] test: Correct detection of UTF8_NFD_TO_NFC for APFS

2018-04-30 Thread Elijah Newren
Hi, On Sun, Apr 29, 2018 at 11:35 PM, wrote: > From: Torsten Bögershausen > > On HFS (which is the default Mac filesystem prior to High Sierra), > unicode names are "decomposed" before recording. > On APFS, which appears to be the new default filesystem in Mac OS

[PATCH v2 1/5] read-cache: teach refresh_cache_entry() to take istate

2018-04-30 Thread Jameson Miller
Refactor refresh_cache_entry() to work on a specific index, instead of implicitly using the_index. This is in preparation for making the make_cache_entry function work on a specific index. Signed-off-by: Jameson Miller --- cache.h | 2 +- merge-recursive.c | 2 +-

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

2018-04-30 Thread Jameson Miller
Adds the following functionality to memory pools: - Lifecycle management functions (init, discard) - Test whether a memory location is part of the managed pool - Function to combine 2 pools This also adds logic to track all memory allocations made by a memory pool. These functions will be

[PATCH v2 5/5] block alloc: add validations around cache_entry lifecyle

2018-04-30 Thread Jameson Miller
Add an option (controlled by an environment variable) perform extra validations on mem_pool allocated cache entries. When set: 1) Invalidate cache_entry memory when discarding cache_entry. 2) When discarding index_state struct, verify that all cache_entries were allocated from expected

[PATCH v2 4/5] block alloc: allocate cache entries from mem_pool

2018-04-30 Thread Jameson Miller
When reading large indexes from disk, a portion of the time is dominated in malloc() calls. This can be mitigated by allocating a large block of memory and manage it ourselves via memory pools. This change moves the cache entry allocation to be on top of memory pools. Design: The index_state

[PATCH v2 2/5] block alloc: add lifecycle APIs for cache_entry structs

2018-04-30 Thread Jameson Miller
Add an API around managing the lifetime of cache_entry structs. Abstracting memory management details behind an API will allow for alternative memory management strategies without affecting all the call sites. This commit does not change how memory is allocated / freed. A later commit in this

[PATCH v2 0/5] Allocate cache entries from memory pool

2018-04-30 Thread Jameson Miller
Changes from V1: - Based patch series off of commit in master - Minor updates based on initial code review feedback Summary: This patch series improves the performance of loading indexes by reducing the number of malloc() calls. Loading the index from disk is partly dominated by the time in

Re: BUG report: unicode normalization on APFS (Mac OS High Sierra)

2018-04-30 Thread Elijah Newren
Hi, On Fri, Apr 27, 2018 at 2:45 PM, Totsten Bögershausen wrote: > On 2018-04-26 19:23, Elijah Newren wrote: >> Sure. First, though, note that I can make it pass (or at least "not >> ok...TODO known breakage") with the following patch (may be >> whitespace-damaged by gmail): >>

Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation

2018-04-30 Thread Ben Peart
On 4/30/2018 10:57 AM, Duy Nguyen wrote: On Mon, Apr 30, 2018 at 4:26 PM, Ben Peart wrote: Take advantage of the recent addition of support for lazy loading functions on Windows to simplfy the loading of NtSetSystemInformation. Signed-off-by: Ben Peart

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

2018-04-30 Thread Duy Nguyen
On Mon, Apr 30, 2018 at 1:56 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Target revision should be available in the index. But this gives me an >> idea to another thing that bugs me: sending the list to the hook means >> I have to deal with separator

Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation

2018-04-30 Thread Duy Nguyen
On Mon, Apr 30, 2018 at 4:26 PM, Ben Peart wrote: > Take advantage of the recent addition of support for lazy loading functions > on Windows to simplfy the loading of NtSetSystemInformation. > > Signed-off-by: Ben Peart > --- > > Notes: > Base

Re: [PATCH v3] unpack_trees: fix breakage when o->src_index != o->dst_index

2018-04-30 Thread Duy Nguyen
On Mon, Apr 30, 2018 at 4:42 PM, Duy Nguyen wrote: > On Sun, Apr 29, 2018 at 10:53 PM, Johannes Schindelin > wrote: >>> > @@ -1412,12 +1422,13 @@ int unpack_trees(unsigned len, struct tree_desc >>> > *t, struct unpack_trees_options >>> >

Re: [PATCH v3] unpack_trees: fix breakage when o->src_index != o->dst_index

2018-04-30 Thread Duy Nguyen
On Sun, Apr 29, 2018 at 10:53 PM, Johannes Schindelin wrote: >> > @@ -1412,12 +1422,13 @@ int unpack_trees(unsigned len, struct tree_desc >> > *t, struct unpack_trees_options >> > WRITE_TREE_SILENT | >> >

[PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation

2018-04-30 Thread Ben Peart
Take advantage of the recent addition of support for lazy loading functions on Windows to simplfy the loading of NtSetSystemInformation. Signed-off-by: Ben Peart --- Notes: Base Ref: master Web-Diff: https://github.com/benpeart/git/commit/6e6ce4a788 Checkout:

Re: branch --contains / tag --merged inconsistency

2018-04-30 Thread Derrick Stolee
On 4/27/2018 12:03 PM, SZEDER Gábor wrote: Szia Feri, I'm moving the IRC discussion here, because this might be a bug report in the end. So, kindly try these steps (103 MB free space required): $ git clone https://github.com/ClusterLabs/pacemaker.git && cd pacemaker [...] $ git branch

Hello compliment of the season

2018-04-30 Thread Mrs. Sufia SALWA
Hello dear Mrs. Sufia SALWA is my name a childless widow suffering from a long time cancer decease and from all indication my condition is really deteriorating and as a result of my present situation I have nothing in mind other than to help the poor . Recently my doctor have confirmed and

Re: git-submodule is missing --dissociate option

2018-04-30 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 30, 2018 at 1:30 PM, Casey Fitzpatrick wrote: > It also seems to be missing "--progress", and I imagine others. > Perhaps submodule add/update should be reworked to automatically > accept all the options that clone would? --progress is not missing, but I see that

Re:

2018-04-30 Thread Ben Peart
On 4/27/2018 2:19 PM, Elijah Newren wrote: From: Elijah Newren On Thu, Apr 26, 2018 at 5:54 PM, Ben Peart wrote: Can you write the documentation that clearly explains the exact behavior you want? That would kill two birds with one stone... :) Sure,

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

2018-04-30 Thread Antonio Ospite
On Mon, 23 Apr 2018 10:47:09 -0700 Jonathan Nieder wrote: > Hi, > Hi Jonathan, thank you for your comment. > Antonio Ospite wrote: > > > vcsh[1] uses bare git repositories and detached work-trees to manage > > *distinct* sets of configuration files directly into $HOME. >

Re: [PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Philip Oakley
From: "Ævar Arnfjörð Bjarmason" I think at this point git-subtree is widely used enough to move out of contrib/, maybe others disagree, but patches are always better for discussion that patch-less ML posts. Assuming this lands in Git, then there will also need to be a

Re: [PATCH v4 02/10] commit: add generation number to struct commmit

2018-04-30 Thread Derrick Stolee
On 4/28/2018 6:35 PM, Jakub Narebski wrote: Derrick Stolee writes: The generation number of a commit is defined recursively as follows: * If a commit A has no parents, then the generation number of A is one. * If a commit A has parents, then the generation number of A

Re: Bug: format-patch MIME boundary not added to cover letter when attach enabled

2018-04-30 Thread brian m. carlson
On Mon, Apr 30, 2018 at 12:30:57PM +0900, Junio C Hamano wrote: > Thanks. It is true that the current output from the tool is corrupt > mime multi-part, and we need to do something about it. > > I however have to wonder if it even makes sense for --cover to pay > attention to --attach and

Re: [PATCH] coccinelle: avoid wrong transformation suggestions from commit.cocci

2018-04-30 Thread Derrick Stolee
On 4/30/2018 5:31 AM, SZEDER Gábor wrote: The semantic patch 'contrib/coccinelle/commit.cocci' added in 2e27bd7731 (treewide: replace maybe_tree with accessor methods, 2018-04-06) is supposed to "ensure that all references to the 'maybe_tree' member of struct commit are either mutations or

Re: [PATCH] Create '--merges-only' option for 'git bisect'

2018-04-30 Thread Tiago Botelho
On Mon, Apr 30, 2018 at 12:31 PM, Johannes Schindelin wrote: > Hi Tiago, > >> > On Thu, 12 Apr 2018, Tiago Botelho wrote: >> > >> >> On Thu, Apr 12, 2018 at 9:58 AM, Christian Couder >> >> wrote: >> >> > On Thu, Apr 12, 2018 at 9:49 AM,

Re: [PATCH] Create '--merges-only' option for 'git bisect'

2018-04-30 Thread Johannes Schindelin
Hi Tiago, > > On Thu, 12 Apr 2018, Tiago Botelho wrote: > > > >> On Thu, Apr 12, 2018 at 9:58 AM, Christian Couder > >> wrote: > >> > On Thu, Apr 12, 2018 at 9:49 AM, Harald Nordgren > >> > wrote: > >> >> I think it looks similar. But if I'm

Re: git-submodule is missing --dissociate option

2018-04-30 Thread Casey Fitzpatrick
It also seems to be missing "--progress", and I imagine others. Perhaps submodule add/update should be reworked to automatically accept all the options that clone would? On Mon, Apr 30, 2018 at 4:29 AM, Casey Fitzpatrick wrote: > This seems to be a hole in the git feature set.

[PATCH 3/4] subtree: fix a test failure under GETTEXT_POISON

2018-04-30 Thread Ævar Arnfjörð Bjarmason
Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t7900-subtree.sh | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/t/t7900-subtree.sh b/t/t7900-subtree.sh index eb223ff049..a6e7103f92 100755 --- a/t/t7900-subtree.sh +++ b/t/t7900-subtree.sh @@ -38,6

[PATCH 4/4] i18n: translate the git-subtree command

2018-04-30 Thread Ævar Arnfjörð Bjarmason
One of the advantages of having git-subtree out of contrib/ is being able to treat it as a first-class citizen when it comes to translations. Mark those messages that make sense to translate for translation, and add a comment to the ones that shouldn't be translated. This has been tested under

[PATCH 2/4] subtree: remove support for git version <1.7

2018-04-30 Thread Ævar Arnfjörð Bjarmason
Now that git-subtree is in-tree there's no reason to be supporting older git Versions. This reverts & amends 448e71e263 ("Use 'git merge -Xsubtree' when git version >= 1.7.0.", 2010-05-07). Signed-off-by: Ævar Arnfjörð Bjarmason --- git-subtree.sh | 19 --- 1

[PATCH 0/4] subtree: move out of contrib

2018-04-30 Thread Ævar Arnfjörð Bjarmason
I think at this point git-subtree is widely used enough to move out of contrib/, maybe others disagree, but patches are always better for discussion that patch-less ML posts. Ævar Arnfjörð Bjarmason (4): git-subtree: move from contrib/subtree/ subtree: remove support for git version <1.7

[PATCH 1/4] git-subtree: move from contrib/subtree/

2018-04-30 Thread Ævar Arnfjörð Bjarmason
Change the git-subtree command from living in contrib to being a "real" git command. I think it's useful enough that it should be shipped by default, and unlike git-submodule doesn't need any changes to git's object format. It's just a helper to do things you can do manually already with plumbing

[PATCH 1/1] wt-status: use rename settings from init_diff_ui_defaults

2018-04-30 Thread Eckhard S. Maaß
Since the very beginning, git status behaved differently for rename detection than other rename aware commands like git log or git show as it has the use of rename hard coded into it. After 5404c116aa ("diff: activate diff.renames by default", 2016-02-25) the default behaves the same by

[PATCH 0/1] Use the diff.rename configuration for git status

2018-04-30 Thread Eckhard S. Maaß
Hello, I have been irritated that the output of git status does not adhere to the same diff settings than the other commands like git show. I think it is more of an oversight and git status is also intended to show the same kind of rename detection (without any more options passed a long the

[PATCH] coccinelle: avoid wrong transformation suggestions from commit.cocci

2018-04-30 Thread SZEDER Gábor
The semantic patch 'contrib/coccinelle/commit.cocci' added in 2e27bd7731 (treewide: replace maybe_tree with accessor methods, 2018-04-06) is supposed to "ensure that all references to the 'maybe_tree' member of struct commit are either mutations or accesses through get_commit_tree()". So

Re: [PATCH v1 1/1] test: Correct detection of UTF8_NFD_TO_NFC for APFS

2018-04-30 Thread Torsten Bögershausen
On 30.04.18 09:56, Junio C Hamano wrote: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> >> On HFS (which is the default Mac filesystem prior to High Sierra), >> unicode names are "decomposed" before recording. >> On APFS, which appears to be the new default filesystem

git-submodule is missing --dissociate option

2018-04-30 Thread Casey Fitzpatrick
This seems to be a hole in the git feature set. I believe it is fairly easily worked around, but it would be best to provide the option for ease of use (and maybe performance?). git clone has both a --reference feature and a --dissociate option, with dissociate allowing for a reference to *only*

  1   2   >