Re: [PATCH 01/11] t9902-completion: add tests demonstrating issues with quoted pathnames

2018-04-16 Thread Junio C Hamano
SZEDER Gábor writes: > Do any more new tests need FUNNYNAMES* prereq? Hmph, all of these look like they involve some funnynames ;-) > +test_expect_failure 'complete files - escaped characters on cmdline' ' > + test_when_finished "rm -rf \"New|Dir\"" && > +

Re: [PATCH 2/2] builtin/blame: highlight recently changed lines

2018-04-16 Thread Junio C Hamano
It seems that this $ git -c color.blame.repeatedlines=cyan blame --heated-lines builtin/blame.c refuses to run. Would it work if the configuration is in .git/config instead, or would it forever disable --heated-lines once somebody choses to use --color-lines feature by default by configuring it

Re: [PATCH 2/2] builtin/blame: highlight recently changed lines

2018-04-16 Thread Junio C Hamano
Stefan Beller writes: > Choose a different color for dates and imitate a 'temperature cool down' > depending upon age. > > Originally I had planned to have the temperature cooldown dependent on > the age of the project or file for example, as that might scale better, > but

Re: [PATCH 1/2] builtin/blame: dim uninteresting metadata lines

2018-04-16 Thread Junio C Hamano
Stefan Beller writes: > @@ -316,10 +318,11 @@ static const char *format_time(timestamp_t time, const > char *tz_str, > #define OUTPUT_PORCELAIN 010 > #define OUTPUT_SHOW_NAME 020 > #define OUTPUT_SHOW_NUMBER 040 > -#define OUTPUT_SHOW_SCORE 0100 > -#define

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

2018-04-16 Thread Junio C Hamano
Sergey Organov writes: > 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. Makes sense. If there were distinction

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Kaartic Sivaraam
Hi, On Tuesday 17 April 2018 03:56 AM, Christian Couder wrote: > Hi, > > On Mon, Apr 16, 2018 at 5:07 PM, Kaartic Sivaraam > wrote: >> >> That said, I read the draft and found it good except for two minor issues, > > Thanks for your comments! > You're welcome!

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

2018-04-16 Thread Junio C Hamano
Harald Nordgren writes: > 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: >

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

2018-04-16 Thread Junio C Hamano
"brian m. carlson" writes: > If we just want to add gpgsm support, that's fine, but we should be > transparent about that fact and try to avoid making an interface which > is at once too generic and not generic enough. One thing that makes me somewhat worried is

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

2018-04-16 Thread Junio C Hamano
Johannes Sixt writes: > 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

Re: man page for "git remote set-url" seems confusing/contradictory

2018-04-16 Thread Jacob Keller
On Mon, Apr 16, 2018 at 4:13 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> Things won't work so well if you set the push url and fetch url to >> different repositories. Git assumes that refs updated by "push" will >> also be reflected via

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Jacob Keller
On Mon, Apr 16, 2018 at 3:30 PM, Christian Couder wrote: > On Mon, Apr 16, 2018 at 5:19 PM, Sergey Organov wrote: >> Kaartic Sivaraam writes: >> >>> 1. I see the following sentence in the "Rebasing merges: a jorney to

Re: [PATCH] worktree: accept -f as short for --force for removal

2018-04-16 Thread Eric Sunshine
On Mon, Apr 16, 2018 at 6:16 PM, Stefan Beller wrote: > The force flag is very common in many commands and is commonly > abbreviated with '-f', so add that to worktree removal, too > > Signed-off-by: Stefan Beller > --- > diff --git a/builtin/worktree.c

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

2018-04-16 Thread brian m. carlson
On Mon, Apr 16, 2018 at 02:05:32PM +0900, Junio C Hamano wrote: > "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

[BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key

2018-04-16 Thread Thandesha VK
git p4 clone fails when p4 sizes does not return 'fileSize' key. There are few cases when p4 sizes returens 0 size and with marshaled output, it doesn’t return the fileSize attribute. Here is the demonstration and potential fix $ cd /tmp/git/ $ git remote -v origin

Re: man page for "git remote set-url" seems confusing/contradictory

2018-04-16 Thread Junio C Hamano
Jacob Keller writes: > Things won't work so well if you set the push url and fetch url to > different repositories. Git assumes that refs updated by "push" will > also be reflected via "fetch". > > I don't know offhand what will break, but likely something will. For >

THIS MESSAGE IS IMPORTANT FOR YOU

2018-04-16 Thread Elizabeth White
I HAVE AN IMPORTANT MESSAGE TO DISCUSS WITH YOU, PLEASE WRITE BACK TO ME FOR DETAILS. REGARDS, ELIZABETH WHITE -Sent from IPad

Re: [PATCH] show: add --follow-symlinks option for :

2018-04-16 Thread Junio C Hamano
Michael Vogt writes: > Add a --follow-symlinks option that'll resolve symlinks to their > targets when the target is of the form :. This not only affects "show" but all in the "log" family of commands, because the change is made to revision.[ch] that is shared by them. I doubt

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Elijah Newren
On Sun, Apr 15, 2018 at 6:44 PM, Junio C Hamano wrote: > One thing that makes me curious is what happens (and what we want to > happen) when such a "we already have the changes the side branch > tries to bring in" path has local (i.e. not yet in the index) > changes. For a

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Elijah Newren
On Sun, Apr 15, 2018 at 7:03 PM, Linus Torvalds wrote: > On Sun, Apr 15, 2018 at 6:44 PM, Junio C Hamano wrote: >> One thing that makes me curious is what happens (and what we want to >> happen) when such a "we already have the changes the side

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

2018-04-16 Thread Junio C Hamano
Jakub Narębski writes: > On 16 April 2018 at 15:15, SZEDER Gábor wrote: >> No. 'sed' would only need need help when its input comes from a buggy >> 'set' builtin of a particular version of Bash from a particular vendor. >> >> As far as I can test this in

[PATCH 11/11] completion: fill COMPREPLY directly when completing paths

2018-04-16 Thread SZEDER Gábor
During git-aware path completion, when a lot of path components have to be listed, a significant amount of time is spent in __gitcomp_file(), or more accurately in the shell loop of __gitcompappend(), iterating over all the path components filtering path components matching the current word to be

[PATCH 10/11] completion: improve handling quoted paths in 'git ls-files's output

2018-04-16 Thread SZEDER Gábor
If any pathname contains backslash, double quote, tab, newline, or any control characters, 'git ls-files' and 'git diff-index' will enclose that pathname in double quotes and escape those special characters using C-style one-character escape sequences or \nnn octal values. This prevents those

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

2018-04-16 Thread Junio C Hamano
SZEDER Gábor writes: >> +while read cmd category tags >> do >> - tag=$(echo "$tags" | sed "$substnum; s/[^0-9]//g") >> + name=${cmd/git-} > > There are two issues with this line: > > - This is a "regular" shell script, therefore it must not use pattern >

[PATCH 00/11] completion: path completion improvements: speedup and quoted paths

2018-04-16 Thread SZEDER Gábor
So, the highlights of this patch series are: - At the top of the worktree in linux.git with over 62k files the time needed for 'git rm ' goes down from 2.15s to 0.052s. - Same place, uniquely completing Makefile with 'git rm Mak' goes down from 2.16s to 0.033s. - Completing paths

[PATCH 04/11] completion: support completing non-ASCII pathnames

2018-04-16 Thread SZEDER Gábor
Unless the user has 'core.quotePath=false' somewhere in the configuration, both 'git ls-files' and 'git diff-index' will by default quote any pathnames that contain bytes with values higher than 0x80, and escape those bytes as '\nnn' octal values. This prevents completing paths when the current

[PATCH 03/11] completion: simplify prefix path component handling during path completion

2018-04-16 Thread SZEDER Gábor
Once upon a time 'git -C "" cmd' errored out with "Cannot change to '': No such file or directory", therefore the completion script took extra steps to run 'git -C "." cmd' instead; see fca416a41e (completion: use "git -C $there" instead of (cd $there && git ...), 2014-10-09). Those extra steps

[PATCH 07/11] completion: use 'awk' to strip trailing path components

2018-04-16 Thread SZEDER Gábor
During git-aware path completion we complete one path component at a time, i.e. 'git add ' offers only 'dir/' at first, not 'dir/subdir/file' right away, just like Bash's own filename completion. However, since both 'git ls-files' and 'git diff-index' dive deep into subdirectories, we have to

[PATCH 08/11] t9902-completion: ignore COMPREPLY element order in some tests

2018-04-16 Thread SZEDER Gábor
The order or possible completion words in the COMPREPLY array doesn't actually matter, as long as all the right words are in there, because Bash will sort them anyway. Yet, our tests looking at the elements of COMPREPLY always expect them to be in a specific order. Now, this hasn't been an issue

[PATCH 06/11] completion: let 'ls-files' and 'diff-index' filter matching paths

2018-04-16 Thread SZEDER Gábor
During git-aware path completion, e.g. 'git rm dir/fil', both 'git ls-files' and 'git diff-index' list all paths in the given 'dir/' matching certain criteria (cached, modified, untracked, etc.) appropriate for the given git command, even paths whose names don't begin with 'fil'. This comes with

[PATCH 09/11] completion: remove repeated dirnames with 'awk' during path completion

2018-04-16 Thread SZEDER Gábor
During git-aware path completion, after all the trailing path components have been removed from the output of 'git ls-files' and 'git diff-index' (see previous patch), each directory name is repeated as many times as the number of listed paths it contains. This can be a lot of repetitions,

[PATCH 01/11] t9902-completion: add tests demonstrating issues with quoted pathnames

2018-04-16 Thread SZEDER Gábor
Completion functions see all words on the command line verbatim, including any backslash-escapes, single and double quotes that might be there. Furthermore, git commands quote pathnames if they contain certain special characters. All these create various issues when doing git-aware path

[PATCH 05/11] completion: improve handling quoted paths on the command line

2018-04-16 Thread SZEDER Gábor
Our git-aware path completion doesn't work when it has to complete a word already containing quoted and/or backslash-escaped characters on the command line. The root cause of the issue is that completion functions see all words on the command line verbatim, i.e. including all backslash, single

[PATCH 02/11] completion: move __git_complete_index_file() next to its helpers

2018-04-16 Thread SZEDER Gábor
It's much easier to read, understand and modify the functions related to git-aware path completion when they are right next to each other. Signed-off-by: SZEDER Gábor --- contrib/completion/git-completion.bash | 39 +- 1 file changed, 19

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Junio C Hamano
Jacob Keller writes: > On Mon, Apr 16, 2018 at 10:43 AM, Jacob Keller wrote: > ... > I think a better solution for your problem would be to extend the > build system you're using to avoid rebuilding when the contents > haven't changed since last

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Christian Couder
On Mon, Apr 16, 2018 at 5:19 PM, Sergey Organov wrote: > Kaartic Sivaraam writes: > >> 1. I see the following sentence in the "Rebasing merges: a jorney to the >> ultimate solution (Road Clear) (written by Jacob Keller)" article >> >> "A few

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Christian Couder
Hi, On Mon, Apr 16, 2018 at 5:07 PM, Kaartic Sivaraam wrote: > > That said, I read the draft and found it good except for two minor issues, Thanks for your comments! > 1. I see the following sentence in the "Rebasing merges: a jorney to the > ultimate solution (Road

[PATCH] worktree: accept -f as short for --force for removal

2018-04-16 Thread Stefan Beller
The force flag is very common in many commands and is commonly abbreviated with '-f', so add that to worktree removal, too Signed-off-by: Stefan Beller --- As a side note: $ git worktree add ../test HEAD^ $ cd ../test $ make $ git worktree remove test fatal: working

Proposal

2018-04-16 Thread MS Zeliha Omer Faruk
Hello Greeetings to you please did you get my previous email regarding my investment proposal last week friday ? MS.Zeliha ömer faruk zeliha.omer.fa...@gmail.com

[PATCH 2/2] builtin/blame: highlight recently changed lines

2018-04-16 Thread Stefan Beller
Choose a different color for dates and imitate a 'temperature cool down' depending upon age. Originally I had planned to have the temperature cooldown dependent on the age of the project or file for example, as that might scale better, but that can be added on top of this commit, e.g. instead of

[PATCH 1/2] builtin/blame: dim uninteresting metadata lines

2018-04-16 Thread Stefan Beller
When using git-blame lots of lines contain redundant information, for example in hunks that consist of multiple lines, the metadata (commit name, author, date) are repeated. A reader may not be interested in those, so offer an option to color the information that is repeated from the previous line

[PATCH 0/2] blame: color line by commit

2018-04-16 Thread Stefan Beller
This is a resend of sb/blame-color, dropping the patch "add option to color metadata fields separately" as I think it is not needed. > Expecting a reroll. > cf. https://public-inbox.org/git/20171110011002.10179-1-sbel...@google.com/#t > error messages are funny, can segfault, ... The error

Re: [RFC 01/10] submodule: add 'core.submodulesFile' to override the '.gitmodules' path

2018-04-16 Thread Stefan Beller
On Mon, Apr 16, 2018 at 9:37 AM, Antonio Ospite wrote: > On Thu, 12 Apr 2018 16:50:03 -0700 > Stefan Beller wrote: > >> Hi Antonio, >> >> On Thu, Apr 12, 2018 at 3:20 PM, Antonio Ospite wrote: >> > When multiple repositories with detached work-trees

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

2018-04-16 Thread Elijah Newren
On Sun, Apr 15, 2018 at 5:37 PM, Junio C Hamano wrote: > 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); >>

Re: [RFC 02/10] submodule: fix getting custom gitmodule file in fetch command

2018-04-16 Thread Antonio Ospite
On Mon, 16 Apr 2018 12:23:59 -0700 Stefan Beller wrote: > On Mon, Apr 16, 2018 at 9:18 AM, Antonio Ospite wrote: > > > > > Is there an API to just load one config setting? > > Do you mean to > > git -c key=value foo-command --options ... I meant, instead

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

2018-04-16 Thread Matthew Coleman
Disclaimer: I'm not a zsh user, so please correct anything I might have gotten wrong. I created a .zshrc with the following contents: autoload -Uz compinit compinit source /usr/local/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh zsh doesn't have broken Unicode output in its

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Stefan Haller
Lars Schneider wrote: > An engineer works on a task branch and runs incremental builds — all > is good. The engineer switches to another branch to review another > engineer's work. This other branch changes a low-level header file, > but no rebuild is triggered. The

shortstat / stat / numstat for git log

2018-04-16 Thread Alexander Mills
@git I have this question: https://stackoverflow.com/questions/49863038/get-numstat-or-stat-for-pretty-format I am looking to generage JSON with the pretty format, but apparent * stat * shortstat * numstat etc cannot be interpolated. can this be updated / improved? -alex -- Alexander D.

Git fast-export with import marks file omits merge commits

2018-04-16 Thread Isaac Chou
Hello, I came across a change of behavior with Git version 2.15 and later where the fast-export command would omit the merge commits.  The same use case works correctly with Git version 2.14 and older.  Here is the detail of the use case: 0> git --version git version 2.16.2.windows.1 1> git

Attn: Sir/Madam,

2018-04-16 Thread Aziz Dake
Attn: Sir/Madam, I am Mr. Aziz Dake, a Minister confide on me to look for foreign partner who will assist him to invest the sum of Thirty Million Dollars ($30,000,000) in your country. He has investment interest in mining, exotic properties for commercial resident, development properties,

Re: [RFC 02/10] submodule: fix getting custom gitmodule file in fetch command

2018-04-16 Thread Stefan Beller
On Mon, Apr 16, 2018 at 9:18 AM, Antonio Ospite wrote: > > Is there an API to just load one config setting? Do you mean to git -c key=value foo-command --options ...

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

2018-04-16 Thread Stefan Beller
Hi Antonio, > I acknowledge that the two mechanisms are different, in particular > because git *writes* the gitmodules file itself. > > I am not opposed to change the name, something like > 'core.submodulesConfigFile' might highlight that the syntax of the file > is the one of git config, but I

Re: man page for "git remote set-url" seems confusing/contradictory

2018-04-16 Thread Jacob Keller
On Mon, Apr 16, 2018 at 9:19 AM, Robert P. J. Day wrote: > On Mon, 16 Apr 2018, Andreas Schwab wrote: > >> On Apr 16 2018, "Robert P. J. Day" wrote: >> >> > i don't understand how you can clearly set the fetch and push URLs >> > of a remote

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

2018-04-16 Thread Jacob Keller
On Sat, Apr 14, 2018 at 6:27 AM, Jakub Narebski wrote: > 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

Re: "proper" way to deactivate push for a remote?

2018-04-16 Thread Jacob Keller
On Mon, Apr 16, 2018 at 7:03 AM, Robert P. J. Day wrote: > > another feature i've seen for the very first time ... working with > kubernetes so i checked it out of github, and part of the instructions > for that is to make sure you don't accidentally try to push back to >

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Phillip Wood
On 16/04/18 17:07, Lars Schneider wrote: > > I am happy to see this discussion and the patches, because long rebuilds > are a constant annoyance for us. We might have been bitten by the exact > case discussed here, but more often, we have a slightly different > situation: > > An engineer

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Jacob Keller
On Mon, Apr 16, 2018 at 10:43 AM, Jacob Keller wrote: > On Mon, Apr 16, 2018 at 9:07 AM, Lars Schneider > wrote: >> What if Git kept a LRU list that contains file path, content hash, and >> mtime of any file that is removed or modified during a

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Jacob Keller
On Mon, Apr 16, 2018 at 9:07 AM, Lars Schneider wrote: > >> On 16 Apr 2018, at 04:03, Linus Torvalds >> wrote: >> >> On Sun, Apr 15, 2018 at 6:44 PM, Junio C Hamano wrote: >>> >>> I think Elijah's corrected

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 16 2018, Lars Schneider wrote: >> On 16 Apr 2018, at 04:03, Linus Torvalds >> wrote: >> >> 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

Re: [RFC 01/10] submodule: add 'core.submodulesFile' to override the '.gitmodules' path

2018-04-16 Thread Antonio Ospite
On Thu, 12 Apr 2018 16:50:03 -0700 Stefan Beller wrote: > Hi Antonio, > > On Thu, Apr 12, 2018 at 3:20 PM, Antonio Ospite wrote: > > When multiple repositories with detached work-trees take turns using the > > same directory as their work-tree, and more than

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

2018-04-16 Thread Ramsay Jones
On 16/04/18 16:43, SZEDER Gábor wrote: > On Sun, Apr 15, 2018 at 6:42 PM, Nguyễn Thái Ngọc Duy > wrote: >> 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

Re: Git Bash Completion Not Working In Emacs

2018-04-16 Thread Andreas Schwab
On Apr 16 2018, Marko Vasic wrote: > Git bash completion script works perfectly under the terminal, > however, it does not work in Emacs (neither shell nor gui mode). Did > anyone encounter this issues and how can it be solved? Depend on how you run the command in Emacs. If

Re: man page for "git remote set-url" seems confusing/contradictory

2018-04-16 Thread Robert P. J. Day
On Mon, 16 Apr 2018, Andreas Schwab wrote: > On Apr 16 2018, "Robert P. J. Day" wrote: > > > i don't understand how you can clearly set the fetch and push URLs > > of a remote independently, while the man page nonetheless insists > > that "even though they can be set

Re: [RFC 02/10] submodule: fix getting custom gitmodule file in fetch command

2018-04-16 Thread Antonio Ospite
On Thu, 12 Apr 2018 16:55:15 -0700 Stefan Beller wrote: > Hi Antonio, > > the subject line could also be > fetch: fix custom submodule location > as I was not expecting this patch from the subject line. > OK. > On Thu, Apr 12, 2018 at 3:20 PM, Antonio Ospite

Re: man page for "git remote set-url" seems confusing/contradictory

2018-04-16 Thread Andreas Schwab
On Apr 16 2018, "Robert P. J. Day" wrote: > i don't understand how you can clearly set the fetch and push URLs of > a remote independently, while the man page nonetheless insists that > "even though they can be set differently, must still refer to the same > place". how

Re: Optimizing writes to unchanged files during merges?

2018-04-16 Thread Lars Schneider
> On 16 Apr 2018, at 04:03, Linus Torvalds > wrote: > > 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

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Jacob Keller
On Mon, Apr 16, 2018 at 5:29 AM, Sergey Organov wrote: > Hi Christian, > > Christian Couder writes: >> On Mon, Apr 16, 2018 at 12:11 AM, Christian Couder >> wrote: >>> >>> A draft of a new Git Rev News edition is

Git Bash Completion Not Working In Emacs

2018-04-16 Thread Marko Vasic
Hello, Git bash completion script works perfectly under the terminal, however, it does not work in Emacs (neither shell nor gui mode). Did anyone encounter this issues and how can it be solved? System I use: OS: Ubuntu 17.10 Emacs: 25.2.2 Thanks, Marko

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

2018-04-16 Thread Duy Nguyen
On Mon, Apr 16, 2018 at 8:28 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> @@ -23,28 +36,44 @@ sed -n ' >> ' "$1" >> printf '};\n\n' >> >> +echo "#define GROUP_NONE 0xff /* no common group */" > > Some later code forgets about this

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

2018-04-16 Thread SZEDER Gábor
On Sun, Apr 15, 2018 at 6:42 PM, Nguyễn Thái Ngọc Duy wrote: > 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

Re: .gitattributes lookup doesn't respect GIT_WORK_TREE

2018-04-16 Thread Duy Nguyen
On Mon, Apr 16, 2018 at 12:40 AM, Andreas Schwab wrote: > 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

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Sergey Organov
Kaartic Sivaraam writes: > Hi, > > On Monday 16 April 2018 08:33 PM, Sergey Organov wrote: >> Christian Couder writes: >>> Here "the above article" means the Jake's "branch -l: print useful >>> info whilst rebasing a non-local branch"

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Kaartic Sivaraam
Hi, On Monday 16 April 2018 08:33 PM, Sergey Organov wrote: > Christian Couder writes: >> Here "the above article" means the Jake's "branch -l: print useful >> info whilst rebasing a non-local branch" article above the current >> article. Just a little correction. I

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Sergey Organov
Christian Couder writes: > Hi Sergey, > [...] > Jake wrote the article below the above line. His article summarizes > the discussions that happened following your email that is linked to > in the above line. The above line is actually the title of Jake's > second

"proper" way to deactivate push for a remote?

2018-04-16 Thread Robert P. J. Day
another feature i've seen for the very first time ... working with kubernetes so i checked it out of github, and part of the instructions for that is to make sure you don't accidentally try to push back to the github remote, so the directions suggest: $ git remote add upstream

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

2018-04-16 Thread Jakub Narębski
On 16 April 2018 at 15:15, SZEDER Gábor wrote: > On Mon, Apr 16, 2018 at 7:10 AM, Junio C Hamano wrote: > > SZEDER Gábor writes: > >> On Fri, Apr 13, 2018 at 11:44 PM, Jakub Narebski wrote: > >>> SZEDER Gábor

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

2018-04-16 Thread SZEDER Gábor
On Mon, Apr 16, 2018 at 7:10 AM, Junio C Hamano wrote: > 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

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Christian Couder
Hi Sergey, On Mon, Apr 16, 2018 at 2:29 PM, Sergey Organov wrote: > Hi Christian, > > Christian Couder writes: >> On Mon, Apr 16, 2018 at 12:11 AM, Christian Couder >> wrote: >>> >>> A draft of a new Git Rev News

man page for "git remote set-url" seems confusing/contradictory

2018-04-16 Thread Robert P. J. Day
never had cause to examine "git remote set-url" before so i'm a bit puzzled by this part of the man page: set-url Changes URLs for the remote. Sets first URL for remote that matches regex ... With --push, push URLs are manipulated instead of fetch URLs. .. snip ... Note that

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Sergey Organov
Hi Christian, Christian Couder writes: > On Mon, Apr 16, 2018 at 12:11 AM, Christian Couder > wrote: >> >> A draft of a new Git Rev News edition is available here: >> >> >>

Re: [RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation

2018-04-16 Thread Antonio Ospite
On Fri, 13 Apr 2018 13:05:18 -0700 Stefan Beller wrote: > Hi Antonio, > > On Fri, Apr 13, 2018 at 1:07 AM, Antonio Ospite wrote: > > This is to test custom gitmodules file paths. The default path can be > > overridden using the 'GIT_MODULES_FILE' environmental

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

2018-04-16 Thread Antonio Ospite
On Thu, 12 Apr 2018 16:36:32 -0700 Stefan Beller wrote: > Hi Antonio, > Hi Stefan, > On Thu, Apr 12, 2018 at 3:20 PM, Antonio Ospite wrote: > > Hi, > > > > vcsh[1] uses bare git repositories and detached work-trees to manage > > *distinct* sets of

Re: Regression in patch add?

2018-04-16 Thread Phillip Wood
On 15/04/18 14:59, Martin Ågren wrote: > 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

Re: Regression in patch add?

2018-04-16 Thread Phillip Wood
On 15/04/18 13:21, mqudsi wrote: > > 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`,

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

2018-04-16 Thread Phillip Wood
On 14/04/18 14:11, Johannes Schindelin wrote: > Hi, > > On Sat, 14 Apr 2018, Phillip Wood wrote: > >> On 13/04/18 17:52, Johannes Sixt wrote: >>> >>> 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

[PATCH] show: add --follow-symlinks option for :

2018-04-16 Thread Michael Vogt
Add a --follow-symlinks option that'll resolve symlinks to their targets when the target is of the form :. Without it, git will show the path of the link itself if the symlink is the leaf node of , or otherwise an error if some component of is a symlink to another location in the repository.

[PATCH v2] show: add --follow-symlinks option for :

2018-04-16 Thread Michael Vogt
Updated version of the `git show --follow-symlink` patch. This version includes the feedback from Ævar Arnfjörð Bjarmason and Stefan Beller: - commit message updated - test fixes merged from Ævar (thanks!) - Documentation/git-show.txt clarified It does not include a test for --follow-symlinks in

Re: Draft of Git Rev News edition 38

2018-04-16 Thread Christian Couder
On Mon, Apr 16, 2018 at 12:11 AM, Christian Couder wrote: > > 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 The draft has just been updated with 2 articles contributed

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

2018-04-16 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > @@ -23,28 +36,44 @@ sed -n ' > ' "$1" > printf '};\n\n' > > +echo "#define GROUP_NONE 0xff /* no common group */" Some later code forgets about this value, and causes "git" to segfault at the end of this entire series. Namely, here: