[ANNOUNCE] New Git PLC Members

2018-09-25 Thread Jeff King
I mentioned about a month ago in [1] that we needed to add members to the committee representing the Git project as part of Software Freedom Conservancy (see that email for details on what exactly that means :) ). I'm happy to announce that this is now done, and both Christian and Ævar

Re: git fetch behaves weirdely when run in a worktree

2018-09-25 Thread Junio C Hamano
Kaartic Sivaraam writes: >> Also please try >> "git fetch" again with GIT_TRACE=1 and GIT_TRACE_SETUP=1. Hopefully we >> could catch something with that. > > $ GIT_TRACE_SETUP=1 GIT_TRACE=1 git fetch origin next > 23:10:26.049785 trace.c:377 set

Re: Git Test Coverage Report (Tuesday, Sept 25)

2018-09-25 Thread Ben Peart
On 9/25/2018 2:42 PM, Derrick Stolee wrote: In an effort to ensure new code is reasonably covered by the test suite, we now have contrib/coverage-diff.sh to combine the gcov output from 'make coverage-test ; make coverage-report' with the output from 'git diff A B' to discover _new_ lines

Re: [PATCH] git help: promote 'git help -av'

2018-09-25 Thread Jeff King
AT_INFO), > - OPT__VERBOSE(, N_("print command description")), > OPT_END(), > }; Would we want to continue respecting "-v" as a noop? I admit I did not even know it existed until this thread, but if people have trained themselves to run "git help -av", we should probably continue to give them this output. -Peff

Re: Git for games working group

2018-09-25 Thread Taylor Blau
On Mon, Sep 24, 2018 at 09:05:56PM -0700, John Austin wrote: > On Mon, Sep 24, 2018 at 12:58 PM Taylor Blau wrote: > > I'm replying to this part of the email to note that this would cause Git > > LFS to have to do some extra work, since running 'git lfs install' > > already

[PATCH v4 7/9] submodule: fetch in submodules git directory instead of in worktree

2018-09-25 Thread Stefan Beller
This patch started as a refactoring to make 'get_next_submodule' more readable, but upon doing so, I realized that "git fetch" of the submodule actually doesn't need to be run in the submodules worktree. So let's run it in its git dir instead. That should pave the way towards fetching

Re: git fetch behaves weirdely when run in a worktree

2018-09-25 Thread Kaartic Sivaraam
On Mon, 2018-09-24 at 17:17 +0200, Duy Nguyen wrote: > On Sun, Sep 23, 2018 at 10:19 PM Kaartic Sivaraam > wrote: > > Yes, some bugs. It behaves correctly for me. There must be something > strange that triggers this. What's your "git worktree list" (iow > anyth

Git Test Coverage Report (Tuesday, Sept 25)

2018-09-25 Thread Derrick Stolee
In an effort to ensure new code is reasonably covered by the test suite, we now have contrib/coverage-diff.sh to combine the gcov output from 'make coverage-test ; make coverage-report' with the output from 'git diff A B' to discover _new_ lines of code that are not covered. This report takes

Re: [PATCH] git help: promote 'git help -av'

2018-09-25 Thread Duy Nguyen
ard-compatible replacement in its current form. > > Yep. I also thought "help -a" was denser but wasn't sure if it > actually helps or not. Whenever I look at that block of commands, I > end up searching anyway. For my use case, "help -a" could be better > served with

Re: bug in 'git describe'?

2018-09-25 Thread Duy Nguyen
gree that the section about "search strategy" is a bit > misleading because it does not mention anything about time stuff. If anybody's updating the man page, I think this is the commit that changed git-describe's search strategy: 80dbae03b0 (Chose better tag names in git-describe after merges. - 2007-01-10) -- Duy

Re: bug in 'git describe'?

2018-09-25 Thread Duy Nguyen
e fewest commits different from the input commit-ish will be > > selected and output. Here fewest commits different is defined as the > > number of commits which would be shown by git log tag..input will be > > the smallest number of commits possible. -- Duy

Re: bug in 'git describe'?

2018-09-25 Thread Sebastian Kuzminsky
On 9/24/18 4:24 PM, Junio C Hamano wrote: Sebastian Kuzminsky writes: I've got two tiny git repos whose commit graphs are identical, but where 'git describe' gives different results. ... The histories differ only in the timestamps of the commits... describe does take the commit timestamps

Re: [PATCH] git help: promote 'git help -av'

2018-09-25 Thread Duy Nguyen
r but wasn't sure if it actually helps or not. Whenever I look at that block of commands, I end up searching anyway. For my use case, "help -a" could be better served with something like "git apropos". I think adding another section about external commands in "help -av" w

Re: Work is not replayed on top while: git pull -v --rebase

2018-09-25 Thread KES
The commits are lost always if both users did `git push --force` How to reproduce: 1. First user: `git push --force` 2. Second user: `git push --force` 3. First user: `git pull -v --rebase` Here after 3 I expect that git will say that after rebase some commits from current branch

Re: Work is not replayed on top while: git pull -v --rebase

2018-09-25 Thread KES
As you can see I have lost some commits. Thus I wanna an option to be safe 20.09.2018, 17:38, "Junio C Hamano" : > KES writes: > >>  PS. for `git push --force` there is alternative: --force-with-lease >>  Is there something similar to --force-with-lease but f

Re: Git for games working group

2018-09-24 Thread John Austin
On Mon, Sep 24, 2018 at 12:58 PM Taylor Blau wrote: > I'm replying to this part of the email to note that this would cause Git > LFS to have to do some extra work, since running 'git lfs install' > already writes to .git/hooks/post-commit (ironically, to detect and > unlock locks th

Re: git silently ignores include directive with single quotes

2018-09-24 Thread Stas Bekman
On 2018-09-24 02:08 PM, Ævar Arnfjörð Bjarmason wrote: [...] > Posting to this mailing list is generally how it's done Thank you, Ævar, for clarifying that there is no issue tracker for the git project. > The best way to fix stuff in git that you can't interest others in is to > do it

Re: [PATCH 0/1] Re: git silently ignores include directive with single quotes

2018-09-24 Thread Stas Bekman
improved debugging/tracing facility. So that a user can see what git is seeing. Once a user sees that their configuration is broken then they can peruse the improved documentation to find why it is broken. Without the debugging ability, the docs would help but it'll be a much longer journey, since

[PATCH 0/1] Re: git silently ignores include directive with single quotes

2018-09-24 Thread Philip Oakley
Rather than attaching the problem with code, I decided to simply update the config file documentation. As the userbase expands the documentation will need to be more comprehensive about exclusions and omissions, along with better highlighting for core areas. I would be useful if Stas could

Re: bug in 'git describe'?

2018-09-24 Thread Junio C Hamano
Sebastian Kuzminsky writes: > I've got two tiny git repos whose commit graphs are identical, but > where 'git describe' gives different results. > ... > The histories differ only in the timestamps of the commits... describe does take the commit timestamps into account, so it is

bug in 'git describe'?

2018-09-24 Thread Sebastian Kuzminsky
I think I've run in to a bug in 'git describe' (reproduced with git 2.11.0, 2.16.1, and 2.19.0.221.g150f307af). I've got two tiny git repos whose commit graphs are identical, but where 'git describe' gives different results. * merge 1.1 into 2.0 (HEAD -> release-

Re: git silently ignores include directive with single quotes

2018-09-24 Thread Ævar Arnfjörð Bjarmason
, I'm asking because the discussion about > this issue has suddenly dropped about 2 weeks ago, hence my ping. Posting to this mailing list is generally how it's done, see https://github.com/git/git/blame/v2.19.0/README.md#L30-L37 Git's a project worked on by a bunch of people who're either doin

Re: [PATCH] git help: promote 'git help -av'

2018-09-24 Thread Junio C Hamano
Jeff King writes: > I agree that "help -av" is likely to be more friendly. I kind of wonder > if it should just be the default for "-a". Do we have any obligation not > to change the format of that output? I know that at least older versions of git-completion.bash

git clone works in ide but not git bash CLI

2018-09-24 Thread David Brown
Howdy, I have a conundrum: App: Spring Cloud Config Server envvars: GIT_URL and SSH_KEY IDE: Intellij 2018.2.4 Ultimate When I use the IDE to assign the SSH_KEY value all is copacetic. If I assign the envvar at the Git Bash CLI: com.jcraft.jsch.JSchException: Auth fail Any guesses? Thanks

Re: [PATCH] git help: promote 'git help -av'

2018-09-24 Thread Jeff King
On Mon, Sep 24, 2018 at 03:20:00PM -0500, Taylor Blau wrote: > On Mon, Sep 24, 2018 at 02:19:28PM -0400, Jeff King wrote: > > On Sat, Sep 22, 2018 at 07:47:07PM +0200, Nguyễn Thái Ngọc Duy wrote: > > > > > When you type "git help" (or just "git") you

Re: [PATCH] git help: promote 'git help -av'

2018-09-24 Thread Taylor Blau
On Mon, Sep 24, 2018 at 02:19:28PM -0400, Jeff King wrote: > On Sat, Sep 22, 2018 at 07:47:07PM +0200, Nguyễn Thái Ngọc Duy wrote: > > > When you type "git help" (or just "git") you are greeted with a list > > with commonly used commands and their short de

Re: Git for games working group

2018-09-24 Thread Taylor Blau
On Mon, Sep 24, 2018 at 08:34:44AM -0700, John Austin wrote: > Perhaps git-global-graph is a decent name. GGG? G3? :). The structure > right now in my head looks a bit like: > > Global Graph: > client - post-commit git hooks to push changes up to the GG I'm replying to this pa

Re: "git rev-parse --show-superproject-working-tree" fails with "fatal: BUG: returned path string doesn't match cwd?" if supermodule has unmerged changes of the submodule reference

2018-09-24 Thread Stefan Beller
On Mon, Sep 24, 2018 at 10:59 AM Sam McKelvie wrote: > > I experienced this problem using git 2.17.1; however, from inspection of the > next branch, function get_superproject_working_tree() in submodule.c has not > changed in 2 years. > > I believe the problem is related to

Re: [PATCH] git help: promote 'git help -av'

2018-09-24 Thread Jeff King
On Sat, Sep 22, 2018 at 07:47:07PM +0200, Nguyễn Thái Ngọc Duy wrote: > When you type "git help" (or just "git") you are greeted with a list > with commonly used commands and their short description and are > suggested to use "git help -a" or "git h

"git rev-parse --show-superproject-working-tree" fails with "fatal: BUG: returned path string doesn't match cwd?" if supermodule has unmerged changes of the submodule reference

2018-09-24 Thread Sam McKelvie
I experienced this problem using git 2.17.1; however, from inspection of the next branch, function get_superproject_working_tree() in submodule.c has not changed in 2 years. I believe the problem is related to the fact that when a merge of the submodule reference is in progress, "git --

Re: Import/Export as a fast way to purge files from Git?

2018-09-24 Thread Elijah Newren
On Sun, Sep 23, 2018 at 6:08 AM Lars Schneider wrote: > > Hi, > > I recently had to purge files from large Git repos (many files, many commits). > The usual recommendation is to use `git filter-branch --index-filter` to purge > files. However, this is *very* slow for large re

Re: [ANNOUNCE] Git v2.8.3

2018-09-24 Thread adam22
Thank you for sharing! ip19216811.site <http://ip19216811.site> -- Sent from: http://git.661346.n2.nabble.com/

Re: Git for games working group

2018-09-24 Thread John Austin
Perhaps git-global-graph is a decent name. GGG? G3? :). The structure right now in my head looks a bit like: Global Graph: client - post-commit git hooks to push changes up to the GG git server - just the standard git server configuration query server - replies with information

Re: git fetch behaves weirdely when run in a worktree

2018-09-24 Thread Duy Nguyen
On Sun, Sep 23, 2018 at 10:19 PM Kaartic Sivaraam wrote: > > Hi, > > I was actually trying to automae the building and installation of Git > source code to reduce my burden. I tried to automate it with the help > of a script that runs daily via cron and a separate

Re: Git for games working group

2018-09-24 Thread Taylor Blau
On Sun, Sep 23, 2018 at 12:53:58PM -0700, John Austin wrote: > On Sun, Sep 23, 2018 at 10:57 AM Randall S. Becker > wrote: > > I would even like to help with your effort and have non-unixy platforms > > I'd like to do this on. > > Having this separate from git LFS is

Re: Git for games working group

2018-09-24 Thread Taylor Blau
On Sun, Sep 23, 2018 at 01:56:37PM -0400, Randall S. Becker wrote: > On September 23, 2018 1:29 PM, John Austin wrote: > > I've been putting together a prototype file-locking implementation for a > > system that plays better with git. What are everyone's thoughts on >

Re: git diff-tree ignores --textconv

2018-09-23 Thread Stas Bekman
On 2018-09-23 06:23 PM, Jeff King wrote: > On Sun, Sep 23, 2018 at 05:56:03PM -0700, Stas Bekman wrote: > >>> You probably want "--ext-diff", not "--textconv". >> [...] >> Would it be safe to ask the maintainer of the application to include >>

Re: git diff-tree ignores --textconv

2018-09-23 Thread Jeff King
On Sun, Sep 23, 2018 at 05:56:03PM -0700, Stas Bekman wrote: > > You probably want "--ext-diff", not "--textconv". > [...] > Would it be safe to ask the maintainer of the application to include > both --textconv and --ext-diff in that 'git diff-tree' call? I

Re: git diff-tree ignores --textconv

2018-09-23 Thread Stas Bekman
On 2018-09-23 05:43 PM, Jeff King wrote: > On Sun, Sep 23, 2018 at 03:41:45PM -0700, Stas Bekman wrote: > >> $ git config --get diff.jupyternotebook.command >> git-nbdiffdriver diff > > That's an "external diff driver", not a textconv driver. > > So he

Re: git diff-tree ignores --textconv

2018-09-23 Thread Jeff King
On Sun, Sep 23, 2018 at 03:41:45PM -0700, Stas Bekman wrote: > $ git config --get diff.jupyternotebook.command > git-nbdiffdriver diff That's an "external diff driver", not a textconv driver. So here: > $ GIT_TRACE=1 git diff-tree -p HEAD --textconv test/test.ipynb > Yo

Re: git silently ignores include directive with single quotes

2018-09-23 Thread Stas Bekman
Apologies for I don't know how this project manages issues, so I'm not sure whether it is my responsibility to make sure this issue gets resolved, or do you have some tracking mechanism where you have it registered? There is no rush, I'm asking because the discussion about this issue has suddenly

git diff-tree ignores --textconv

2018-09-23 Thread Stas Bekman
Hi, I'm using a 3rd party application that internally uses 'git diff-tree' instead of 'git diff'. I'm trying to add filter and it works with 'git diff' but it gets ignored with 'git diff-tree' despite having --textconv. I was able to reproduce the problem with the following much more simplified

RE: Git for games working group

2018-09-23 Thread Randall S. Becker
On September 23, 2018 3:54 PM, John Austin wrote: > On Sun, Sep 23, 2018 at 10:57 AM Randall S. Becker > wrote: > > I would even like to help with your effort and have non-unixy platforms I'd > like to do this on. > > Having this separate from git LFS is an even better

git fetch behaves weirdely when run in a worktree

2018-09-23 Thread Kaartic Sivaraam
Hi, I was actually trying to automae the building and installation of Git source code to reduce my burden. I tried to automate it with the help of a script that runs daily via cron and a separate worktree used only by the build script.y run The script typically fetches new changes for the next

Re: Git for games working group

2018-09-23 Thread John Austin
Regarding integration into LFS, I'd like to build the library in such a way that it would easy to bundle with LFS (so they could share the same git hooks), but also make it flexible enough to work for other workflows. On Sun, Sep 23, 2018 at 12:53 PM John Austin wrote: > > On Sun, Sep 23

Re: Git for games working group

2018-09-23 Thread John Austin
On Sun, Sep 23, 2018 at 10:57 AM Randall S. Becker wrote: > I would even like to help with your effort and have non-unixy platforms I'd > like to do this on. > Having this separate from git LFS is an even better idea IMO, and I would > suggest implementing this using the same

RE: Git for games working group

2018-09-23 Thread Randall S. Becker
On September 23, 2018 1:29 PM, John Austin wrote: > I've been putting together a prototype file-locking implementation for a > system that plays better with git. What are everyone's thoughts on > something like the following? I'm tentatively labeling this system git-sync or >

Re: Git for games working group

2018-09-23 Thread John Austin
I've been putting together a prototype file-locking implementation for a system that plays better with git. What are everyone's thoughts on something like the following? I'm tentatively labeling this system git-sync or sync-server. There are two pieces: 1. A centralized repository called

Re: Import/Export as a fast way to purge files from Git?

2018-09-23 Thread Jeff King
On Sun, Sep 23, 2018 at 03:53:38PM +, brian m. carlson wrote: > I suspect you're gaining speed mostly because you're running three > processes total instead of at least one process (sh) per commit. So I > don't think there's anything that Git can do to make this faster on our >

Re: Import/Export as a fast way to purge files from Git?

2018-09-23 Thread Lars Schneider
> On Sep 23, 2018, at 4:55 PM, Eric Sunshine wrote: > > On Sun, Sep 23, 2018 at 9:05 AM Lars Schneider > wrote: >> I recently had to purge files from large Git repos (many files, many >> commits). >> The usual recommendation is to use `git filter-branc

Re: Import/Export as a fast way to purge files from Git?

2018-09-23 Thread brian m. carlson
On Sun, Sep 23, 2018 at 03:04:58PM +0200, Lars Schneider wrote: > Hi, > > I recently had to purge files from large Git repos (many files, many commits). > The usual recommendation is to use `git filter-branch --index-filter` to purge > files. However, this is *very* slow for l

Re: Import/Export as a fast way to purge files from Git?

2018-09-23 Thread Eric Sunshine
On Sun, Sep 23, 2018 at 9:05 AM Lars Schneider wrote: > I recently had to purge files from large Git repos (many files, many commits). > The usual recommendation is to use `git filter-branch --index-filter` to purge > files. However, this is *very* slow for large repos (e.g. it ta

Import/Export as a fast way to purge files from Git?

2018-09-23 Thread Lars Schneider
Hi, I recently had to purge files from large Git repos (many files, many commits). The usual recommendation is to use `git filter-branch --index-filter` to purge files. However, this is *very* slow for large repos (e.g. it takes 45min to remove the `builtin` directory from git core). I realized

Re: [PATCH] git help: promote 'git help -av'

2018-09-23 Thread Duy Nguyen
On Sat, Sep 22, 2018 at 9:29 PM Ævar Arnfjörð Bjarmason wrote: > > > On Sat, Sep 22 2018, Nguyễn Thái Ngọc Duy wrote: > > > When you type "git help" (or just "git") you are greeted with a list > > with commonly used commands and their short descri

Re: [PATCH] git help: promote 'git help -av'

2018-09-22 Thread Ævar Arnfjörð Bjarmason
On Sat, Sep 22 2018, Nguyễn Thái Ngọc Duy wrote: > When you type "git help" (or just "git") you are greeted with a list > with commonly used commands and their short description and are > suggested to use "git help -a" or "git help -g" for more d

[PATCH] git help: promote 'git help -av'

2018-09-22 Thread Nguyễn Thái Ngọc Duy
When you type "git help" (or just "git") you are greeted with a list with commonly used commands and their short description and are suggested to use "git help -a" or "git help -g" for more details. "git help -av" would be more friendly and inline

[PATCH 6/8] submodule: fetch in submodules git directory instead of in worktree

2018-09-21 Thread Stefan Beller
This patch started as a refactoring to make 'get_next_submodule' more readable, but upon doing so, I realized that "git fetch" of the submodule actually doesn't need to be run in the submodules worktree. So let's run it in its git dir instead. That should pave the way towards fetching

Re: [PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-21 Thread frederik
:59:58PM -0700, Junio C Hamano wrote: > >> > > @@ -23,7 +26,7 @@ OPTIONS > >> > > > >> > > --mode=:: > >> > >Specify layout mode. See configuration variable column.ui for > >> > > option > >> > >

Re: [PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-21 Thread Junio C Hamano
Specify layout mode. See configuration variable column.ui for >> > > option >> > > -syntax. >> > > +syntax (in git-config(1)). >> >> I think we usually link to other commands with "linkgit", like >> linkgit:git-config[1] >>

Re: git check-ignore ignores negated entries

2018-09-21 Thread Duy Nguyen
On Thu, Sep 20, 2018 at 7:25 PM David Alphus wrote: > In looking through check-ignore.c, it appears that we check that > last_exclude_matching() returns an exclude object. It should be noted > that we do not consider that exclude struct can be set with the > EXC_FLAG_NEGATIVE flag. This flag says

Re: [PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-20 Thread Eric Sunshine
Specify layout mode. See configuration variable column.ui for option > > > > - syntax. > > > > + syntax (in git-config(1)). > > > > I think we usually link to other commands with "linkgit", like > > linkgit:git-config[1] > > Thank you

Re: bug with git merge-base

2018-09-20 Thread Junio C Hamano
Junio C Hamano writes: > Well, reading builtin/merge-base.c::handle_fork_point(), I think the > intended behaviour is: > > - die() when input is not well formed (e.g. bad commit object, >ambigous ref name, etc.); there is an error worth reporting in >this case. > > - show one that used

Re: bug with git merge-base

2018-09-20 Thread Junio C Hamano
Eric Sunshine writes: > On Wed, Sep 19, 2018 at 6:25 PM Alexander Mills > wrote: >> The following command sequence exits with 1, and no stderr >> >> base='remotes/origin/dev'; >> fork_point="$(git merge-base --fork-point "$base")";

Re: bug with git merge-base

2018-09-20 Thread Eric Sunshine
On Wed, Sep 19, 2018 at 6:25 PM Alexander Mills wrote: > The following command sequence exits with 1, and no stderr > > base='remotes/origin/dev'; > fork_point="$(git merge-base --fork-point "$base")"; > > I cannot figure out why it's exiting with 1,

[PATCH v3 4/5] tests: don't swallow Git errors upstream of pipes

2018-09-20 Thread Matthew DeVore
Some pipes in tests lose the exit code of git processes, which can mask unexpected behavior like crashes. Split these pipes up so that git commands are only at the end of pipes rather than the beginning or middle. The violations fixed in this patch were found in the process of fixing pipe

[PATCH v3 5/5] t9109: don't swallow Git errors upstream of pipes

2018-09-20 Thread Matthew DeVore
'git ... | foo' will mask any errors or crashes in git, so split up such pipes in this file. One testcase uses several separate pipe sequences in a row which are awkward to split up. Wrap the split-up pipe in a function so the awkwardness is not repeated. Also change that testcase's surrounding

Re: [PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-20 Thread frederik
On Thu, Sep 20, 2018 at 06:23:03PM +0200, Duy Nguyen wrote: > On Wed, Sep 19, 2018 at 03:59:58PM -0700, Junio C Hamano wrote: > > > @@ -23,7 +26,7 @@ OPTIONS > > > > > > --mode=:: > > > Specify layout mode. See configuration variable column.ui for option

git check-ignore ignores negated entries

2018-09-20 Thread David Alphus
If a .gitignore contains a ! entry, git check-ignore will still say the matching file is ignored if the file is not in the index. Simple case to reproduce: $ git init . $ echo "*.c" > .gitignore $ echo '!a.c' >> .gitignore $ touch a.c b.c $ git check-ignore a.c b.c a.

[PATCH] completion: support "git fetch --multiple"

2018-09-20 Thread Nguyễn Thái Ngọc Duy
When --multiple is given, the remaining arguments are remote names, not one remote followed by zero or more refspec. Detect this case, disable refspec completion, and pretend no remote is seen in order to complete multiple of them. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git

Re: [PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-20 Thread Duy Nguyen
On Wed, Sep 19, 2018 at 03:59:58PM -0700, Junio C Hamano wrote: > > @@ -23,7 +26,7 @@ OPTIONS > > > > --mode=:: > > Specify layout mode. See configuration variable column.ui for option > > - syntax. > > + syntax (in git-config(1)). I thi

Re: Work is not replayed on top while: git pull -v --rebase

2018-09-20 Thread Junio C Hamano
KES writes: > PS. for `git push --force` there is alternative: --force-with-lease > Is there something similar to --force-with-lease but for `git pull -v > --rebase`? Curious. For "push", you are competing with the other pushers who want to update the repository over there

Re: [PATCH 0/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo

2018-09-20 Thread Junio C Hamano
So please see if the issue is there, or if you find other new issues (as this is essentially an attempted faithful re-implementation), in the version on 'pu', and report/fix them in there if necessary. Thanks. > Shulhan (1): > git-rebase--interactive.sh: fix trailing spaces on empty $todo > > git-rebase--interactive.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [PATCH 3/4] git-commit-graph.txt: refer to "*commit* graph file"

2018-09-20 Thread Derrick Stolee
aining few instances of the "commit-graph file" in this document.) The file is literally at ".git/objects/info/commit-graph" which is why I tried to use "commit-graph" everywhere. Why do you think that "commit graph" is better? I noticed the discrepancy

Re: [PATCH 3/4] git-commit-graph.txt: refer to "*commit* graph file"

2018-09-20 Thread Martin Ågren
few instances of the "commit-graph file" in this document.) > > The file is literally at ".git/objects/info/commit-graph" which is why I > tried to use "commit-graph" everywhere. Why do you think that "commit > graph" is better? I noticed th

Re: [PATCH 3/4] git-commit-graph.txt: refer to "*commit* graph file"

2018-09-20 Thread Derrick Stolee
On 9/19/2018 12:30 PM, Martin Ågren wrote: This document sometimes refers to the "commit graph file" as just "the graph file". This saves a couple of words here and there at the risk of confusion. In particular, the documentation for `git commit-graph read

Re: [PATCH 2/4] git-commit-graph.txt: typeset more in monospace

2018-09-20 Thread Derrick Stolee
On 9/19/2018 12:30 PM, Martin Ågren wrote: While we're here, fix an instance of "folder" to be "directory". These changes are clearly good. Thanks!

Re: [PATCH 1/4] git-commit-graph.txt: fix bullet lists

2018-09-20 Thread Derrick Stolee
`*`. Thank you for noticing this. It clearly looks wrong at https://git-scm.com/docs/git-commit-graph -Stolee

Work is not replayed on top while: git pull -v --rebase

2018-09-20 Thread KES
Hi. TL;DR; Some local commits are lost while `git pull -v --rebase` [alias] tree= log --graph --decorate --pretty=oneline --abbrev-commit changes = log --graph --decorate --pretty=oneline --abbrev-commit --cherry-pick --boundary --left-right $ git fetch origin remote

Re: [PATCH 1/3] git-archimport.1: specify what kind of Arch we're talking about

2018-09-19 Thread frederik
> I think "Is it a CPU archtecture?" is a red-herring, but between It wasn't meant to be a red-herring though. Plenty of Linux distributions have different architecture-specific package repos, and arch is a common abbreviation for architecture. This only comes up if you search for the full word

Re: [PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-19 Thread Junio C Hamano
Frederick Eaton writes: > When I read this man page I couldn't figure out what kind of input it > was referring to, or how input was being put into columns, or where I > should look for the syntax of the --mode option. > > Signed-off-by: Frederick Eaton > --- > Documen

Re: [PATCH 1/3] git-archimport.1: specify what kind of Arch we're talking about

2018-09-19 Thread Junio C Hamano
Frederick Eaton writes: > Is it a CPU architecture? Is it Arch Linux? If you search for "arch > repository", nothing relevant comes up. Let's call it GNU Arch so > people can find it with search engines. > > Signed-off-by: Frederick Eaton > --- > Documentation/gi

bug with git merge-base

2018-09-19 Thread Alexander Mills
The following command sequence exits with 1, and no stderr base='remotes/origin/dev'; fork_point="$(git merge-base --fork-point "$base")"; I cannot figure out why it's exiting with 1, but there is no stdout/stderr -alex -- Alexander D. Mills ¡¡¡ New cell phone n

[PATCH 3/3] git-describe.1: clarify that "human readable" is also git-readable

2018-09-19 Thread Frederick Eaton
The caption uses the term "human readable", but the DESCRIPTION did not explain this in context. Signed-off-by: Frederick Eaton --- Documentation/git-describe.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-describe.txt b/Documen

[PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-19 Thread Frederick Eaton
When I read this man page I couldn't figure out what kind of input it was referring to, or how input was being put into columns, or where I should look for the syntax of the --mode option. Signed-off-by: Frederick Eaton --- Documentation/git-column.txt | 35

[PATCH 1/3] git-archimport.1: specify what kind of Arch we're talking about

2018-09-19 Thread Frederick Eaton
Is it a CPU architecture? Is it Arch Linux? If you search for "arch repository", nothing relevant comes up. Let's call it GNU Arch so people can find it with search engines. Signed-off-by: Frederick Eaton --- Documentation/git-archimport.txt | 5 +++-- 1 file changed, 3 insert

Re: Access Git ssh on port 8822 ?

2018-09-19 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 19 2018, Jeff King wrote: > On Wed, Sep 19, 2018 at 02:47:09PM -0300, Leonardo Bozzi wrote: > >> Good afternoon, I'm trying to set up a git server, but I want to use >> ssh access to connect clients on my server, but because of a >> limitation in my int

Re: Access Git ssh on port 8822 ?

2018-09-19 Thread Leonardo Bozzi
Ok git clone ssh://bo...@bozzi.net:8822/opt/gitcurso access sucess. Adm. Leonardo Bozzi Administrador / Analista de Sistemas Tel.: (27) 99988-4576 CRA-ES: 13256 Em qua, 19 de set de 2018 às 14:50, Jeff King escreveu: > > On Wed, Sep 19, 2018 at 02:47:09PM -0300, Leonardo Bozzi

Re: [PATCH v2 6/6] t9109-git-svn-props.sh: split up several pipes

2018-09-19 Thread Matthew DeVore
then I saw that there were testcases farther away in the same file that used single quotes. Here is the new commit message: t9109: don't swallow Git errors upstream of pipes 'git ... | foo' will mask any errors or crashes in git, so split up such pipes in this file. One testcase uses several

Re: [PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Martin Ågren
Hi Taylor, On Wed, 19 Sep 2018 at 19:21, Taylor Blau wrote: > I could take or leave 2/2, since I usually write ", (see: above)", but > I'm not sure if that's grammatically correct or not. Well, I sure ain't no grammar expert too... This is not a patch I feel strongly about, so I'll be happy to

Re: Access Git ssh on port 8822 ?

2018-09-19 Thread Jeff King
On Wed, Sep 19, 2018 at 02:47:09PM -0300, Leonardo Bozzi wrote: > Good afternoon, I'm trying to set up a git server, but I want to use > ssh access to connect clients on my server, but because of a > limitation in my internet provider it blocks access from outside on > port 22,

Access Git ssh on port 8822 ?

2018-09-19 Thread Leonardo Bozzi
Good afternoon, I'm trying to set up a git server, but I want to use ssh access to connect clients on my server, but because of a limitation in my internet provider it blocks access from outside on port 22, so I changed the same from ssh to 8822. But when I give the command: $git remote add

Re: [PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Taylor Blau
Hi Martin, On Wed, Sep 19, 2018 at 06:38:19PM +0200, Martin Ågren wrote: > Rather than saying "(see: above)", drop the colon. Also drop the comma > before this note. > > Signed-off-by: Martin Ågren Thanks for both of these. I should have at least taken care of 1/2 myself, but I am appreciative

[PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Martin Ågren
Rather than saying "(see: above)", drop the colon. Also drop the comma before this note. Signed-off-by: Martin Ågren --- Documentation/git-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config

[PATCH 4/4] git-commit-graph.txt: refer to the "commit graph file" without dash

2018-09-19 Thread Martin Ågren
The command is `git commit-graph`, but the file it processes is the "commit graph file" without a dash. We have a few references to the "commit-graph file", though. Fix them. Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 6 +++--- 1 file changed

[PATCH 3/4] git-commit-graph.txt: refer to "*commit* graph file"

2018-09-19 Thread Martin Ågren
This document sometimes refers to the "commit graph file" as just "the graph file". This saves a couple of words here and there at the risk of confusion. In particular, the documentation for `git commit-graph read` appears to suggest that there are indeed different types of

[PATCH 1/4] git-commit-graph.txt: fix bullet lists

2018-09-19 Thread Martin Ågren
--- Documentation/git-commit-graph.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index dececb79d7..f42f2a1481 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -73,7

[PATCH 2/4] git-commit-graph.txt: typeset more in monospace

2018-09-19 Thread Martin Ågren
While we're here, fix an instance of "folder" to be "directory". Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-co

[PATCH 0/4] git-commit-graph.txt: various cleanups

2018-09-19 Thread Martin Ågren
The first patch is a bug-fix. The second applies some more `monospace`-ing, which should also be good thing. The last two patches are based on my understanding that `git commit-graph` handles the "commit graph file", without a dash. If that's correct, there might be more such cleanups

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-19 Thread Jeff King
e > > > > object-db writes, but I think in most cases it would be fine. I almost > > > > always "git stash" away discarded changes these days instead of "git > > > > reset --hard", because it effectively provides this kind of log. > > &

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-19 Thread Duy Nguyen
On Wed, Sep 19, 2018 at 1:19 AM Jeff King wrote: > > On Tue, Sep 18, 2018 at 12:36:06PM -0700, Jacob Keller wrote: > > > > I like that, too. It's a little more costly just because it may involve > > > object-db writes, but I think in most cases it would be fine. I alm

<    5   6   7   8   9   10   11   12   13   14   >