Re: Bug: rebase -i creates committer time inversions on 'reword'

Am 15.04.2018 um 23:35 schrieb Junio C Hamano: Ah, do you mean we have an internal sequence like this, when "rebase --continue" wants to conclude an edit/reword? Yes, it's only 'reword' that is affected, because then subsequent picks are processed by the original process. - we figure out

[PATCH] glossary: substitute "ancestor" for "direct ancestor" in 'push' description.

Even though "direct ancestor" is not defined in the glossary, the common meaning of the term is simply "parent", parents being the only direct ancestors, and the rest of ancestors being indirect ancestors. As "parent" is obviously wrong in this place in the description, we should simply say

Re: [PATCH] completion: reduce overhead of clearing cached --options

SZEDER Gábor writes: > On Fri, Apr 13, 2018 at 11:44 PM, Jakub Narebski wrote: >> SZEDER Gábor writes: >>> In Bash we can do better: run the 'compgen -v __gitcomp_builtin_' >>> builtin command, which lists the same variables, but

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

"brian m. carlson" writes: > On Tue, Apr 10, 2018 at 04:24:27AM -0400, Eric Sunshine wrote: >> How confident are we that _all_ possible signing programs will conform >> to the "-BEGIN %s-" pattern? If we're not confident, then >> perhaps the user should be

Re: [PATCH v4 0/4] Make DEVELOPER more more flexible with DEVOPTS

Ævar Arnfjörð Bjarmason writes: > This is a v4 and replacement of gitster/nd/warn-more-for-devs. I'm > sending this with Duy's blessing. > > The first two patches are the same, except for one trivial > s/faimily/family/ typo fix. > > The third patch in

Re: [PATCH v2 0/7] nd/repack-keep-pack update

Nguyễn Thái Ngọc Duy writes: > On Sat, Apr 14, 2018 at 9:47 PM, Ævar Arnfjörð Bjarmason > wrote: >> The only (trivial) issue I found in the patches themselves was that >> between 4/5 and 5/7 you're adding an empty line to config.txt in 4/7 >> just to erase

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

Nguyễn Thái Ngọc Duy writes: > +category_list () { > + command_list "$1" | awk '{print $2;}' | sort | uniq > +} Piping output of awk to sort/uniq, instead of processing all inside awk within the END block of the script, means that we are wasting two processes---I do not

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

Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > contrib/completion/git-completion.bash | 2 +- > git.c | 2 ++ > help.c | 18 ++ > help.h

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

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

Re: Optimizing writes to unchanged files during merges?

On Sun, Apr 15, 2018 at 6:44 PM, Junio C Hamano wrote: > > I think Elijah's corrected was_tracked() also does not care "has > this been renamed". I'm perfectly happy with the slightly smarter patches. My patch was really just an RFC and because I had tried it out. > One thing

Re: Optimizing writes to unchanged files during merges?

Linus Torvalds writes: > How about we take a completely different approach? Instead of relying > on fragile (but clever) tests, why not rely on stupid brute force? > > Yeah, yeah, it's bad to be stupid, but sometimes simple and stupid > really does work. > > See

Re: [PATCH] t1510-repo-setup.sh: rm useless mkdir

qingyu...@foxmail.com writes: > From: Tao Qingyun <845767...@qq.com> > > Signed-off-by: Tao Qingyun <845767...@qq.com> > --- > t/t1510-repo-setup.sh | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh > index e6854b828..972bd9c78 100755 > ---

Re: [PATCH v1] fsmonitor: fix incorrect buffer size when printing version number

Ben Peart writes: > On 4/10/2018 4:17 PM, Eric Sunshine wrote: >> On Tue, Apr 10, 2018 at 2:43 PM, Ben Peart wrote: >>> This is a trivial bug fix for passing the incorrect size to snprintf() when >>> outputing the version. It should be passing the

Re: [PATCH v9 29.75/30] merge-recursive: Fix was_tracked() to quit lying with some renamed paths

Elijah Newren writes: > @@ -362,13 +363,17 @@ static int git_merge_trees(struct merge_options *o, > init_tree_desc_from_tree(t+2, merge); > > rc = unpack_trees(3, t, >unpack_opts); > + cache_tree_free(_cache_tree); > + > + o->orig_index = the_index; > +

Re: [PATCH v8 04/14] graph: add commit graph design document

Derrick Stolee writes: > +Future Work > +--- > + > +- The commit graph feature currently does not honor commit grafts. This can > + be remedied by duplicating or refactoring the current graft logic. The problem in my opinion lies in different direction, namely that

Re: .gitattributes lookup doesn't respect GIT_WORK_TREE

On Apr 16 2018, Junio C Hamano wrote: > I may be mistaken (I do not have the code in front of me right now) > but IIRC after the setup.c code runs (which happens quite early in > the sequence that starts from git.c::cmd_main()), the Git process > moves to the top level of the

Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll

Junio C Hamano writes: > I think you identified the problem and diagnosed it correctly, but I > find that the change proposed here introduces a severe layering > violation. The code is still calling what is called poll(), which > should not have such a broken semantics. I

Draft of Git Rev News edition 38

Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-38.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll

Kim Gybels writes: > The poll provided in compat/poll.c is not interrupted by receiving > SIGCHLD. Use a timeout for cleaning up dead children in a timely manner. I think you identified the problem and diagnosed it correctly, but I find that the change proposed here

Re: Bug: rebase -i creates committer time inversions on 'reword'

Johannes Sixt writes: > I just noticed that all commits in a 70-commit branch have the same > committer timestamp. This is very unusual on Windows, where rebase -i of > such a long branch takes more than one second (but not more than 3 or > so thanks to the builtin nature of the

Re: [PATCH/RFC 0/5] Keep all info in command-list.txt in git binary

From: "Duy Nguyen" : Saturday, April 14, 2018 4:44 PM On Thu, Apr 12, 2018 at 12:06 AM, Philip Oakley wrote: I'm only just catching up, but does/can this series also capture the non-command guides that are available in git so that the 'git help -g' can

Re: Feature Request: Add diff.word-diff and perhaps diff.word-diff-regex configuration options to enable always using word-diffs in git diff

Ævar Arnfjörð Bjarmason writes: > On Sat, Apr 14 2018, Doron Behar wrote: > >> I've just came across the wonderful command line option for `git diff`: >> `--word-diff`. It could be great to have a configuration option that >> will enable this feature by default when running

Re: .gitattributes lookup doesn't respect GIT_WORK_TREE

Andreas Schwab writes: > The functions in attr.c do not look at $GIT_WORK_TREE when trying to > find the .gitattributes file. Thus if you are not inside the work tree, > but have GIT_WORK_TREE set attribute lookup will be wrong. I may be mistaken (I do not have the code

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

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

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

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

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

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

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

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

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

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

Re: [PATCH 2/2] daemon: graceful shutdown of client connection

On (13/04/18 15:03), Johannes Schindelin wrote: > I wonder whether you found a reliable way to trigger this? It would be > nice to have a regression test for this. On my system, it reproduced reliably using Oleg's example [1], below is my bash version of it. Script to generate repository with

.gitattributes lookup doesn't respect GIT_WORK_TREE

The functions in attr.c do not look at $GIT_WORK_TREE when trying to find the .gitattributes file. Thus if you are not inside the work tree, but have GIT_WORK_TREE set attribute lookup will be wrong. Password Store is using this feature when the password store is

[PATCH v13 10/10] convert: add round trip check based on 'core.checkRoundtripEncoding'

From: Lars Schneider UTF supports lossless conversion round tripping and conversions between UTF and other encodings are mostly round trip safe as Unicode aims to be a superset of all other character encodings. However, certain encodings (e.g. SHIFT-JIS) are known to

[PATCH v13 09/10] convert: add tracing for 'working-tree-encoding' attribute

From: Lars Schneider Add the GIT_TRACE_WORKING_TREE_ENCODING environment variable to enable tracing for content that is reencoded with the 'working-tree-encoding' attribute. This is useful to debug encoding issues. Signed-off-by: Lars Schneider

[PATCH v13 07/10] convert: add 'working-tree-encoding' attribute

From: Lars Schneider Git recognizes files encoded with ASCII or one of its supersets (e.g. UTF-8 or ISO-8859-1) as text files. All other encodings are usually interpreted as binary and consequently built-in Git text processing tools (e.g. 'git diff') as well as most Git

[PATCH v13 06/10] utf8: add function to detect a missing UTF-16/32 BOM

From: Lars Schneider If the endianness is not defined in the encoding name, then let's be strict and require a BOM to avoid any encoding confusion. The is_missing_required_utf_bom() function returns true if a required BOM is missing. The Unicode standard instructs to

[PATCH v13 03/10] strbuf: add a case insensitive starts_with()

From: Lars Schneider Check in a case insensitive manner if one string is a prefix of another string. This function is used in a subsequent commit. Signed-off-by: Lars Schneider --- git-compat-util.h | 1 + strbuf.c | 9 + 2

[PATCH v13 04/10] utf8: teach same_encoding() alternative UTF encoding names

From: Lars Schneider The function same_encoding() could only recognize alternative names for UTF-8 encodings. Teach it to recognize all kinds of alternative UTF encoding names (e.g. utf16). While we are at it, fix a crash that would occur if same_encoding() was called

[PATCH v13 01/10] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

From: Lars Schneider Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we allocate the buffer for the lower case string with xmallocz(). This already ensures a NUL at the end of the allocated buffer. Remove the unnecessary assignment. Signed-off-by:

[PATCH v13 05/10] utf8: add function to detect prohibited UTF-16/32 BOM

From: Lars Schneider Whenever a data stream is declared to be UTF-16BE, UTF-16LE, UTF-32BE or UTF-32LE a BOM must not be used [1]. The function returns true if this is the case. This function is used in a subsequent commit. [1]

[PATCH v13 00/10] convert: add support for different encodings

From: Lars Schneider Hi, Patches 1-6,9 are preparation and helper functions. Patch 7,8,10 are the actual change. This series is based on v2.16.0 and Torsten's 8462ff43e4 (convert_to_git(): safe_crlf/checksafe becomes int conv_flags, 2018-01-13). The series can be

[PATCH v13 02/10] strbuf: add xstrdup_toupper()

From: Lars Schneider Create a copy of an existing string and make all characters upper case. Similar xstrdup_tolower(). This function is used in a subsequent commit. Signed-off-by: Lars Schneider --- strbuf.c | 12 strbuf.h |

[PATCH v13 08/10] convert: check for detectable errors in UTF encodings

From: Lars Schneider Check that new content is valid with respect to the user defined 'working-tree-encoding' attribute. Signed-off-by: Lars Schneider --- convert.c| 61 +++

Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll

On (13/04/18 14:36), Johannes Schindelin wrote: > > The poll provided in compat/poll.c is not interrupted by receiving > > SIGCHLD. Use a timeout for cleaning up dead children in a timely manner. > > Maybe say "When using this poll emulation, use a timeout ..."? I will rewrite the commit message

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

From: "Phillip Wood" : Friday, April 13, 2018 11:03 AM If a label or reset command fails it is likely to be due to a typo. Rescheduling the command would make it easier for the user to fix the problem as they can just run 'git rebase --edit-todo'. Is this worth

Re: [PATCH v11 06/10] convert: add 'working-tree-encoding' attribute

> On 05 Apr 2018, at 18:41, Torsten Bögershausen wrote: > > On 01.04.18 15:24, Lars Schneider wrote: >>> TRUE or false are values, but just wrong ones. >>> If this test is removed, the user will see "failed to encode "TRUE" to >>> "UTF-8", >>> which should give enough

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

common-cmds.h is used to extract the list of common commands (by group) and a one-line summary of each command. Some information is dropped, for example command category or summary of other commands. Update generate-cmdlist.sh to keep all the information. The extra info will be used shortly.

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

This is useful for git-completion.bash because it needs this set of commands. Right now we have to maintain a separate command category in there. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 94 ++ git.c

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

The help command currently hard codes the list of guides and their summary in C. Let's move this list to command-list.txt. This lets us extract summary lines from Documentation/git*.txt. This also potentially lets us lists guides in git.txt, but I'll leave that for now. Signed-off-by: Nguyễn Thái

[PATCH v2 0/6] Keep all info in command-list.txt in git binary

v2 changes - bug fixes spotted by Eric - keep 'git help -av' layout close to what's in git.txt - enable pager for 'git help -av' because it's usually long - move guide list (aka 'help -g') to command-list.txt Nguyễn Thái Ngọc Duy (6): git.c: convert --list-builtins to --list-cmds=builtins

[PATCH v2 1/6] git.c: convert --list-builtins to --list-cmds=builtins

Even if this is a hidden option, let's make it a bit more generic since we're introducing more listing types. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- git.c | 12 +++- t/t0012-help.sh

[PATCH v2 5/6] help: add "-a --verbose" to list all commands with synopsis

This lists all recognized commands [1] by category. The group order follows closely git.txt. [1] We may actually show commands that are not built (e.g. if you set NO_PERL you don't have git-instaweb but it's still listed here). I ignore the problem because on Linux a git package could be split

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

Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- git.c | 2 ++ help.c | 18 ++ help.h | 1 + 4 files changed, 22

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

On Mon, Apr 9, 2018 at 6:59 AM, Eric Sunshine wrote: >> +awk '{print $2;}' | > > At one time, Junio expressed concerns[2] about having an 'awk' > dependency in the build system (in fact, with regards to this same > generation process). Whether he still has such concerns

[PATCH v2 4/7] gc: add gc.bigPackThreshold config

The --keep-largest-pack option is not very convenient to use because you need to tell gc to do this explicitly (and probably on just a few large repos). Add a config key that enables this mode when packs larger than a limit are found. Note that there's a slight behavior difference compared to

[PATCH v2 6/7] gc --auto: exclude base pack if not enough mem to "repack -ad"

pack-objects could be a big memory hog especially on large repos, everybody knows that. The suggestion to stick a .keep file on the giant base pack to avoid this problem is also known for a long time. Recent patches add an option to do just this, but it has to be either configured or activated

[PATCH v2 3/7] gc: add --keep-largest-pack option

This adds a new repack mode that combines everything into a secondary pack, leaving the largest pack alone. This could help reduce memory pressure. On linux-2.6.git, valgrind massif reports 1.6GB heap in "pack all" case, and 535MB in "pack all except the base pack" case. We save roughly 1GB

[PATCH v2 7/7] pack-objects: show some progress when counting kept objects

We only show progress when there are new objects to be packed. But when --keep-pack is specified on the base pack, we will exclude most of objects. This makes 'pack-objects' stay silent for a long time while the counting phase is going. Let's show some progress whenever we visit an object

[PATCH v2 5/7] gc: handle a corner case in gc.bigPackThreshold

This config allows us to keep packs back if their size is larger than a limit. But if this N >= gc.autoPackLimit, we may have a problem. We are supposed to reduce the number of packs after a threshold because it affects performance. We could tell the user that they have incompatible

[PATCH v2 0/7] nd/repack-keep-pack update

On Sat, Apr 14, 2018 at 9:47 PM, Ævar Arnfjörð Bjarmason wrote: > The only (trivial) issue I found in the patches themselves was that > between 4/5 and 5/7 you're adding an empty line to config.txt in 4/7 > just to erase it in 5/7, better not to add it to begin with, but >

[PATCH v2 1/7] t7700: have closing quote of a test at the beginning of line

The closing quote of a test body by convention is always at the start of line. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- t/t7700-repack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7700-repack.sh

Re: Regression in patch add?

Hi Mahmoud On 15 April 2018 at 14:21, wrote: > I first run `git add -p`, then manually edit a chunk (after hitting `s` > once, if it matters). The chunk originally contains the following: [...] > Under git 2.7.4, I can edit it to the following, which is accepted > without

[PATCH v3] bisect: create 'bisect_flags' parameter in find_bisection()

Make it possible to implement bisecting only on first parents or on merge commits by passing flags to find_bisection(), instead of just a 'find_all' boolean. Signed-off-by: Harald Nordgren --- Notes: Updating commit message bisect.c | 20

Re: [PATCH v2] Make it possible to implement bisecting only on first parents or on merge commits by passing flags to find_bisection(), instead of just a find_all boolean

On Sun, Apr 15, 2018 at 12:44 PM, Harald Nordgren wrote: > Signed-off-by: Harald Nordgren > --- > > Notes: > Updates according to Christian Couder's code review About the commit message (its first line and its body), I was suggesting a

Regression in patch add?

Hello all, I'm currently running the latest version of git built from `master`, and I'm running into what appears to be a regression in the behavior of the piecewise `git add -p` when applying a manually edited chunk. I first run `git add -p`, then manually edit a chunk (after hitting `s` once,

Can i have a word with you?

Disclaimer: This message may contain privileged and confidential information and is solely for the use of intended recipient. The views expressed in this email

Generate more revenue from Git

Hi, ​​My name is Michal and I lead the SDK partnerships at Luminati.​ I assume your software earns money by charging users for a premium subscription or by showing ads - both models do not pay out much and harm the user experience. We now offer you a third option. Luminati’s monetization SDK

[PATCH v2] Make it possible to implement bisecting only on first parents or on merge commits by passing flags to find_bisection(), instead of just a find_all boolean

Signed-off-by: Harald Nordgren --- Notes: Updates according to Christian Couder's code review bisect.c | 20 bisect.h | 6 -- builtin/rev-list.c | 6 +++--- 3 files changed, 19 insertions(+), 13 deletions(-) diff

Re: [PATCH] Create 'bisect_flags' parameter in find_bisection() in preparation of passing multiple options

Hi, On Sun, Apr 15, 2018 at 10:58 AM, Harald Nordgren wrote: > --- > > Notes: > Preperatory patch to enable either Tiago Botelho's or my patch, to do > bisection on first parents / merge commits It would be nice if you could move some part of the above note into

[PATCH] Create 'bisect_flags' parameter in find_bisection() in preparation of passing multiple options

--- Notes: Preperatory patch to enable either Tiago Botelho's or my patch, to do bisection on first parents / merge commits bisect.c | 21 - bisect.h | 5 +++-- builtin/rev-list.c | 6 +++--- 3 files changed, 18 insertions(+), 14 deletions(-) diff