Re: feature request, git-gui: add hotkey to toggle amend/new

2019-09-03 Thread Johannes Sixt
Am 03.09.19 um 14:45 schrieb Pratyush Yadav: > Can you try doing a Shift+Tab? For me on Linux, if I hit Shift+Tab, it > immediately takes me to the "Amend last commit" option. Then I can press > space to select it and Tab again to get back to the commit message. That works on Windows with Ctrl+S

Re: [PATCH] Add hotkey to toggle "Amend Last Commit" radio selector

2019-09-03 Thread Birger Skogeng Pedersen
Hi Pratyush, So how does this work? Should I email the patch that Bert has created? Or is it okay that it just remains on Github. (Considering the git mail archives) Birger

Re: git-gui: Long lines in commit message gets hidden, no scrollbar appears

2019-09-03 Thread Birger Skogeng Pedersen
Hi Pratyush, Just wanted to chime in on this one: On Mon, Sep 2, 2019 at 8:58 PM Pratyush Yadav wrote: > On second thought, wouldn't it make more sense to expand the commit > message buffer instead? The point of resizing that pane is to see more > of the commit message. So it makes more sense t

Re: [PATCH 1/1] upload-pack: fix race condition in error messages

2019-09-03 Thread Jeff King
On Fri, Aug 30, 2019 at 02:10:05PM +0200, SZEDER Gábor wrote: > On Fri, Aug 30, 2019 at 12:06:30AM +0200, SZEDER Gábor wrote: > > On Thu, Aug 29, 2019 at 11:58:18PM +0200, SZEDER Gábor wrote: > > > On Thu, Aug 29, 2019 at 10:38:05AM -0400, Jeff King wrote: > > > > So any fixes there have to happen

Re: [PATCH v3 1/2] list-objects-filter: only parse sparse OID when 'have_git_dir'

2019-09-03 Thread Jeff King
On Fri, Aug 30, 2019 at 11:08:34AM -0700, Junio C Hamano wrote: > Jon Simons writes: > > > diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c > > index 1cb20c659c..aaba312edb 100644 > > --- a/list-objects-filter-options.c > > +++ b/list-objects-filter-options.c > > @@ -71

Re: [PATCH v2 0/2] asciidoctor-extensions: provide ``

2019-09-03 Thread Jeff King
On Tue, Sep 03, 2019 at 08:51:19PM +0200, Martin Ågren wrote: > Almost half a year ago, I wrote: > > To be clear. *This* patch has a sufficiently incorrect commit message > > that it really needs a makeover. You can expect a v2. > > Finally, here's that v2. I should probably refresh memories: The

Re: Failure to fetch submodule with --depth=1 parameter

2019-09-03 Thread Jeff King
On Tue, Sep 03, 2019 at 05:30:02PM +0200, Grigory Yakushev wrote: > $ git --version > git version 2.17.1 > > Repro: > $ git clone https://github.com/PX4/Firmware.git > $ cd Firmware > $ git submodule update --init --recursive --depth=1 > ... > error: Server does not allow request for unadvertised

Re: [PATCH 1/1] fetch: add fetch.writeCommitGraph config setting

2019-09-03 Thread Jeff King
On Mon, Sep 02, 2019 at 07:22:02PM -0700, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The commit-graph feature is now on by default, and is being > written during 'git gc' by default. Typically, Git only writes > a commit-graph when a 'git gc --auto' command passes the gc.a

Re: [RFC PATCH 1/1] commit-graph.c: die on un-parseable commits

2019-09-03 Thread Jeff King
On Tue, Sep 03, 2019 at 10:22:57PM -0400, Taylor Blau wrote: > When we write a commit graph chunk, we process a given list of 'struct > commit *'s and parse out the parent(s) and tree OID in order to write > out its information. > > We do this by calling 'parse_commit_no_graph', and then checking

[RFC PATCH 0/1] commit-graph.c: handle corrupt commit trees

2019-09-03 Thread Taylor Blau
Hi, I was running some of the new 'git commit-graph' commands, and noticed that I could consistently get 'git commit-graph write --reachable' to segfault when a commit's root tree is corrupt. I have an extremely-unfinished fix attached as an RFC PATCH below, but I wanted to get a few thoughts on

[RFC PATCH 1/1] commit-graph.c: die on un-parseable commits

2019-09-03 Thread Taylor Blau
When we write a commit graph chunk, we process a given list of 'struct commit *'s and parse out the parent(s) and tree OID in order to write out its information. We do this by calling 'parse_commit_no_graph', and then checking the result of 'get_commit_tree_oid' to write the tree OID. This process

Re: [PATCH] cache-tree: do not lazy-fetch merge tree

2019-09-03 Thread Derrick Stolee
On 9/3/2019 3:42 PM, Jonathan Tan wrote: > When cherry-picking (for example), new trees may be constructed. During > this process, Git checks whether these trees exist. However, in a > partial clone, this causes a lazy fetch to occur, which is both > unnecessary (because Git has already constructed

Re: [RFC] Post/tutorial for newcomers

2019-09-03 Thread Matheus Tavares Bernardino
On Tue, Sep 3, 2019 at 4:23 AM pedro rijo wrote: > > Hey Matheus, > > Just gave a quick look at your post, and I find it awesome! I think > it covers most of the pains new contributors may have. Great > initiative! Thank you, Pedro! Also, if you have any suggestions for it, please, let me know.

Re: [RFC] Post/tutorial for newcomers

2019-09-03 Thread Matheus Tavares Bernardino
On Tue, Sep 3, 2019 at 4:49 AM Olga Telezhnaya wrote: > > вт, 3 сент. 2019 г. в 05:32, Matheus Tavares Bernardino > : > > > > Here is the end result: > > https://matheustavares.gitlab.io/posts/first-steps-contributing-to-git > > If you have any comments or suggestions for it, please, let me know :

Re: [PATCH] t: use LF variable defined in the test harness

2019-09-03 Thread Taylor Blau
Hi Junio, On Tue, Sep 03, 2019 at 02:11:22PM -0700, Junio C Hamano wrote: > A few test scripts assign a single LF to $LF, but that is already > given by test-lib.sh to everybody. I didn't know that 't/test-lib.sh' provided '$LF' (as I'm sure was the case for the respective authors of those tests

Re: [PATCH 1/1] fetch: add fetch.writeCommitGraph config setting

2019-09-03 Thread Derrick Stolee
On 9/3/2019 3:05 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" writes: > >> diff --git a/builtin/fetch.c b/builtin/fetch.c >> index 53ce99d2bb..d36a403859 100644 >> --- a/builtin/fetch.c >> +++ b/builtin/fetch.c >> @@ -23,6 +23,7 @@ >> #include "packfile.h" >> #include "list-obj

Re: [PATCH v2 0/2] asciidoctor-extensions: provide ``

2019-09-03 Thread brian m. carlson
On 2019-09-03 at 18:51:19, Martin Ågren wrote: > Almost half a year ago, I wrote: > > To be clear. *This* patch has a sufficiently incorrect commit message > > that it really needs a makeover. You can expect a v2. > > Finally, here's that v2. I should probably refresh memories: The goal of > the m

Re: [PATCH v5 2/4] t3427: accelerate this test by using fast-export and fast-import

2019-09-03 Thread Junio C Hamano
Junio C Hamano writes: > Elijah Newren writes: > >> +extract_files_subtree () { >> +git fast-export --no-data HEAD -- files_subtree/ | >> +sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" | >> +git fast-import --force --quiet >> +} This change has obvious interaction

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

2019-09-03 Thread Matt Rogers
I agree that the code locally was simple enough. Ultimately I feel that sanitizing and uniqueifying the label should probably be done closer together/at the same place. I'm just not familiar enough with the codebase to know a good place (if any) to move that to. Eventually though this would stil

Re: [PATCH v5 1/4] t6006: simplify and optimize empty message test

2019-09-03 Thread Junio C Hamano
Elijah Newren writes: > Ah, good catch. I checked out the commit before 1fb5fdd25f0 > ("rev-list: fix --pretty=oneline with empty message", 2010-03-21), to > try and see the error before that testcase was introduced. I tried it > on a repo with both an actual empty commit message, and one with

Re: [PATCH] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Pratyush Yadav
On 02/09/19 06:23PM, Philip Oakley wrote: > On 02/09/2019 13:25, Pratyush Yadav wrote: > > On 01/09/19 11:27PM, Philip Oakley wrote: > > > Hi Pratyus, [snip] > > > Are there any plans or thoughts about creating a more inclusive > > > man page for > > > the git-gui? > > Having better documentation

Re: [PATCH v5 1/4] t6006: simplify and optimize empty message test

2019-09-03 Thread Elijah Newren
On Tue, Sep 3, 2019 at 2:08 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > Test t6006.71 ("oneline with empty message") was creating two commits > > with simple commit messages, and then running filter-branch to rewrite > > the commit messages to be empty. This test was written this wa

Re: [PATCH v4] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Pratyush Yadav
Thanks for the re-roll. Before you send out the v5, a couple more things you missed. Other than those, LGTM. On 03/09/19 08:07PM, Birger Skogeng Pedersen wrote: [snip] > @@ -2640,6 +2642,27 @@ proc show_less_context {} { > } > } > > +proc select_path_in {widget} { There was a suggestion

Re: [PATCH v5 3/4] Recommend git-filter-repo instead of git-filter-branch

2019-09-03 Thread Junio C Hamano
Elijah Newren writes: > diff --git a/git-filter-branch.sh b/git-filter-branch.sh > index 5c5afa2b98..f805965d87 100755 > --- a/git-filter-branch.sh > +++ b/git-filter-branch.sh > @@ -83,6 +83,19 @@ set_ident () { > finish_ident COMMITTER > } > > +if [ -z "$FILTER_BRANCH_SQUELCH_WARNING"

Re: Retrieve version-string on shallow clone

2019-09-03 Thread Reino Wijnsma
Hello Giuseppe, Philip and Jeff, On 2019-09-02T16:08:54+0200, Giuseppe Crinò wrote: > To my understanding both questions are solved by > * https://stackoverflow.com/a/47720414/2219670 > * https://stackoverflow.com/a/12704727/2219670 On 2019-09-02T17:52:19+0200, Philip Oakley wrote: > Start by ge

Re: [PATCH v5 2/4] t3427: accelerate this test by using fast-export and fast-import

2019-09-03 Thread Junio C Hamano
Elijah Newren writes: > +extract_files_subtree () { > + git fast-export --no-data HEAD -- files_subtree/ | > + sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" | > + git fast-import --force --quiet > +} Clever, if a bit filthy ;-). We expect to see something like

[PATCH] t: use LF variable defined in the test harness

2019-09-03 Thread Junio C Hamano
A few test scripts assign a single LF to $LF, but that is already given by test-lib.sh to everybody. Remove the unnecessary reassignment. Signed-off-by: Junio C Hamano --- t/t3404-rebase-interactive.sh | 2 -- t/t4013-diff-various.sh | 3 --- t/t5515-fetch-merge-logic.sh | 3 --- 3 files

Re: [PATCH v5 1/4] t6006: simplify and optimize empty message test

2019-09-03 Thread Junio C Hamano
Elijah Newren writes: > Test t6006.71 ("oneline with empty message") was creating two commits > with simple commit messages, and then running filter-branch to rewrite > the commit messages to be empty. This test was written this way because > the --allow-empty-message option to git commit did no

hello Git

2019-09-03 Thread bolaji jibodu
Git https://clck.ru/Huk3t bolaji jibodu

Re: Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Σταύρος Ντέντος
> Makes me wonder if git status could maybe warn about empty trees as > 'untracked'? Well, I "suppose" git-add could warn you that you are adding an empty tree (and I'd like if that happened, implicit vs explicit action i.e. ignoring). However, I assume the no-empty-tree case was a design decisio

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

2019-09-03 Thread Junio C Hamano
Johannes Schindelin writes: > If you care deeply about double dashes and leading dashes, how about > this instead? > > char *from, *to; > > for (from = to = label.buf; *from; from++) > if ((*from & 0x80) || isalnum(*from)) >

[PATCH] cache-tree: do not lazy-fetch merge tree

2019-09-03 Thread Jonathan Tan
When cherry-picking (for example), new trees may be constructed. During this process, Git checks whether these trees exist. However, in a partial clone, this causes a lazy fetch to occur, which is both unnecessary (because Git has already constructed this tree as part of the cherry-picking process)

Re: [PATCH v4] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Birger Skogeng Pedersen
Hi Pratyush, I just realised I had forgotten about the local variable prefixed with an underscore. So v5 of the patch will be coming up. Also I got quite uncertain, should I have added you in the commit msg somehow? I've seen elsewhere that people add the "Signed-off-by" line with the name of the

[PATCH v3 2/3] merge: use refresh_and_write_cache

2019-09-03 Thread Thomas Gummerer
Use the 'refresh_and_write_cache()' convenience function introduced in the last commit, instead of refreshing and writing the index manually in merge.c Signed-off-by: Thomas Gummerer --- builtin/merge.c | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/builtin/me

[PATCH v3 3/3] stash: make sure to write refreshed cache

2019-09-03 Thread Thomas Gummerer
When converting stash into C, calls to 'git update-index --refresh' were replaced with the 'refresh_cache()' function. That is fine as long as the index is only needed in-core, and not re-read from disk. However in many cases we do actually need the refreshed index to be written to disk, for exam

[PATCH v3 0/3] make sure stash refreshes the index properly

2019-09-03 Thread Thomas Gummerer
Thanks Martin and Junio for the comments on the previous round. Changes compared to the previous round: - Document that when failing to refresh the index, the result won't be written to disk. - Rollback the lock file if refreshing the index fails, so we don't end up with a lock file that can't

[PATCH v3 1/3] factor out refresh_and_write_cache function

2019-09-03 Thread Thomas Gummerer
Getting the lock for the index, refreshing it and then writing it is a pattern that happens more than once throughout the codebase, and isn't trivial to get right. Factor out the refresh_and_write_cache function from builtin/am.c to read-cache.c, so it can be re-used in other places in a subsequen

Re: Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Junio C Hamano
Taylor Blau writes: > If you wish to keep this directory "empty", but stored in Git, a common > convention is to create an empty '.gitkeep' file in the directory. This > file is not special in any way to Git, rather it serves as _a_ file to > keep the directory non-empty. Hmph, I thought the com

Re: [PATCH 1/1] fetch: add fetch.writeCommitGraph config setting

2019-09-03 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > diff --git a/builtin/fetch.c b/builtin/fetch.c > index 53ce99d2bb..d36a403859 100644 > --- a/builtin/fetch.c > +++ b/builtin/fetch.c > @@ -23,6 +23,7 @@ > #include "packfile.h" > #include "list-objects-filter-options.h" > #include "commit-reach.h" >

[PATCH v5 0/4] Warn about git-filter-branch usage and avoid it

2019-09-03 Thread Elijah Newren
It's been about 5 days with no further feedback, other than some timings from Dscho for Windows showing that my fixes help there too. So, I did one last re-read, made a couple small wording tweaks, and am resending as ready for inclusion. Changes since v4: * Included the windows timings from Ds

[PATCH v5 1/4] t6006: simplify and optimize empty message test

2019-09-03 Thread Elijah Newren
Test t6006.71 ("oneline with empty message") was creating two commits with simple commit messages, and then running filter-branch to rewrite the commit messages to be empty. This test was written this way because the --allow-empty-message option to git commit did not exist at the time. Simplify t

[PATCH v5 2/4] t3427: accelerate this test by using fast-export and fast-import

2019-09-03 Thread Elijah Newren
fast-export and fast-import can easily handle the simple rewrite that was being done by filter-branch, and should be significantly faster on systems with a slow fork. Timings from before and after on a few laptops that I or others measured on (measured via `time ./t3427-rebase-subtree.sh`, i.e. in

[PATCH v5 4/4] t9902: use a non-deprecated command for testing

2019-09-03 Thread Elijah Newren
t9902 had a list of three random porcelain commands as a sanity check, one of which was filter-branch. Since we are recommending people not use filter-branch, let's update this test to use rebase instead of filter-branch. Signed-off-by: Elijah Newren --- t/t9902-completion.sh | 12 ++--

[PATCH v5 3/4] Recommend git-filter-repo instead of git-filter-branch

2019-09-03 Thread Elijah Newren
filter-branch suffers from a deluge of disguised dangers that disfigure history rewrites (i.e. deviate from the deliberate changes). Many of these problems are unobtrusive and can easily go undiscovered until the new repository is in use. This can result in problems ranging from an even messier h

[PATCH v2 2/2] doc-diff: replace --cut-header-footer with --cut-footer

2019-09-03 Thread Martin Ågren
After the previous commit, AsciiDoc and Asciidoctor render the manpage headers identically, so we no longer need the "cut the header" part of our `--cut-header-footer` option. We do still need the "cut the footer" part, though. The previous commit improved the rendering of the footer in Asciidoctor

[PATCH v2 0/2] asciidoctor-extensions: provide ``

2019-09-03 Thread Martin Ågren
Almost half a year ago, I wrote: > To be clear. *This* patch has a sufficiently incorrect commit message > that it really needs a makeover. You can expect a v2. Finally, here's that v2. I should probably refresh memories: The goal of the main patch here is to make the headers and footers of our ma

[PATCH v2 1/2] asciidoctor-extensions: provide ``

2019-09-03 Thread Martin Ågren
When we build with AsciiDoc, asciidoc.conf ensures that each xml-file we generate contains some meta-information which `xmlto` can act on, based on the following template: {mantitle} {manvolnum} Git {git_version} Git Manual When we build with Asciidoctor, it does not honor this co

Re: [PATCH] push: disallow --all and refspecs when remote..mirror is set

2019-09-03 Thread Junio C Hamano
Thomas Gummerer writes: > Here's a patch to fix it: > > --- >8 --- > Pushes with --all, or refspecs are disallowed when --mirror is given > to 'git push', or when 'remote..mirror' is set in the config of > the repository, because they can have surprising > effects. 800a4ab399 ("push: check for er

Re: [PATCH v4 08/24] Ensure index matches head before invoking merge machinery, round N

2019-09-03 Thread Elijah Newren
Hi Dscho, On Tue, Sep 3, 2019 at 6:34 AM Johannes Schindelin wrote: > > Hi Elijah, > > On Tue, 3 Sep 2019, Johannes Schindelin wrote: > > > On Sat, 17 Aug 2019, Elijah Newren wrote: > > > > > * t3030-merge-recursive.h: this test has always been broken in that it > > > didn't make sure to ma

Re: [PATCH v4] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Birger Skogeng Pedersen
Hi, (Sorry that I hadn't used the proper version in the subject before, I'm new (as you could probably tell already)) In addition to your changes, I removed the unused ui_workdir variable and modified the bindings to be ALT+1/2/3/4. Shoud I have listed you in the commit? Or did I do it according t

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

2019-09-03 Thread Junio C Hamano
Johannes Schindelin writes: >> I'm sightly concerned that this opens the possibility for unexpected effects >> if two different labels get sanitized to the same string. I suspect it's >> unlikely to happen in practice but doing something like percent encoding >> non-alphanumeric characters would

[PATCH v4] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Birger Skogeng Pedersen
The user cannot change focus between the list of files, the diff view and the commit message widgets without using the mouse (clicking either of the four widgets). With this patch, the user may set ui focus to the previously selected path in either the "Unstaged Changes" or "Staged Changes" widget

[PATCH 5/5] unpack-trees: rename 'is_excluded_from_list()'

2019-09-03 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The first consumer of pattern-matching filenames was the .gitignore feature. In that context, storing a list of patterns as a 'struct exclude_list' makes sense. However, the sparse-checkout feature then adopted these structures and methods, but with the opposite meaning: the

[PATCH 0/5] Refactor excludes library

2019-09-03 Thread Derrick Stolee via GitGitGadget
The exclude library defined in dir.h was originally written for the .gitignore feature, but has since been used for .gitattributes and sparse-checkout. In the later applications, these patterns are used for inclusion rather than exclusion, so the name is confusing. This gets particularly bad when

[PATCH 1/5] treewide: rename 'struct exclude' to 'struct path_pattern'

2019-09-03 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The first consumer of pattern-matching filenames was the .gitignore feature. In that context, storing a list of patterns as a list of 'struct exclude' items makes sense. However, the sparse-checkout feature then adopted these structures and methods, but with the opposite mean

[PATCH 4/5] treewide: rename 'exclude' methods to 'pattern'

2019-09-03 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The first consumer of pattern-matching filenames was the .gitignore feature. In that context, storing a list of patterns as a 'struct exclude_list' makes sense. However, the sparse-checkout feature then adopted these structures and methods, but with the opposite meaning: the

[PATCH 3/5] treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'

2019-09-03 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The first consumer of pattern-matching filenames was the .gitignore feature. In that context, storing a list of patterns as a 'struct exclude_list' makes sense. However, the sparse-checkout feature then adopted these structures and methods, but with the opposite meaning: the

[PATCH 2/5] treewide: rename 'struct exclude_list' to 'struct pattern_list'

2019-09-03 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The first consumer of pattern-matching filenames was the .gitignore feature. In that context, storing a list of patterns as a 'struct exclude_list' makes sense. However, the sparse-checkout feature then adopted these structures and methods, but with the opposite meaning: the

Re: [PATCH v2 1/3] factor out refresh_and_write_cache function

2019-09-03 Thread Junio C Hamano
Thomas Gummerer writes: > On 08/30, Junio C Hamano wrote: >> Martin Ågren writes: >> ... >> > The above makes me think that once this new function is in good shape, >> > the commit introducing it could sell it as "this is hard to get right -- >> > let's implement it correctly once and for all".

Re: [RFC PATCH 0/5] Remove git-filter-branch from git.git; host it elsewhere

2019-09-03 Thread Elijah Newren
Hi Dscho, On Mon, Sep 2, 2019 at 2:30 AM Johannes Schindelin wrote: > > Hi Elijah, > > On Fri, 30 Aug 2019, Elijah Newren wrote: > > > On Fri, Aug 30, 2019 at 1:40 PM Johannes Schindelin > > wrote: > > > > > [...] > > > In my most recent instance of this, I wanted to publish the script I > > > u

Re: feature request, git-gui: add hotkey to toggle amend/new

2019-09-03 Thread Pratyush Yadav
On 03/09/19 04:06PM, Birger Skogeng Pedersen wrote: > Hi Pratyush, > > > On Tue, Sep 3, 2019 at 2:45 PM Pratyush Yadav wrote: > > Can you try doing a Shift+Tab? For me on Linux, if I hit Shift+Tab, it > > immediately takes me to the "Amend last commit" option. Then I can press > > space to selec

Re: feature request, git-gui: add hotkey to toggle amend/new

2019-09-03 Thread Pratyush Yadav
On 04/09/19 01:35AM, David wrote: > On Tue, 3 Sep 2019 at 22:45, Pratyush Yadav wrote: > > > > Can you try doing a Shift+Tab? For me on Linux, if I hit Shift+Tab, it > > immediately takes me to the "Amend last commit" option. Then I can press > > space to select it and Tab again to get back to the

Re: git-gui: Long lines in commit message gets hidden, no scrollbar appears

2019-09-03 Thread Pratyush Yadav
On 02/09/19 09:13PM, Bert Wesarg wrote: > On Mon, Sep 2, 2019 at 9:03 PM Bert Wesarg wrote: > > [snip] > > > On second thought, wouldn't it make more sense to expand the > > > commit > > > message buffer instead? The point of resizing that pane is to see more > > > of the commit message. So it ma

Re: Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Philip Oakley
On 03/09/2019 15:11, Σταύρος Ντέντος wrote: The original folder did had a folder structure 3 levels deep. Unfortunately, I don't remember if the leaves were files (or directories themselves). However, since I "replicated" it, I went ahead and cleaned up my main repo (sigh). Thank you for remindi

Re: [PATCH] Add hotkey to toggle "Amend Last Commit" radio selector

2019-09-03 Thread Bert Wesarg
Birger, On Tue, Sep 3, 2019 at 10:52 AM Bert Wesarg wrote: > > Birger, > > On Mon, Sep 2, 2019 at 9:56 PM Birger Skogeng Pedersen > wrote: > > > > Selecting whether to do a "New Commit" or "Amend Last Commit" does not have > > a hotkey. > > > > With this patch, the user may toggle between the tw

Re: [PATCH] [PATCH] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Bert Wesarg
On Tue, Sep 3, 2019 at 4:22 PM Pratyush Yadav wrote: > > On 02/09/19 09:42PM, Bert Wesarg wrote: > > On Sun, Sep 1, 2019 at 9:37 PM Birger Skogeng Pedersen > > wrote: > > > > > > The user cannot change focus between the list of files, the diff view and > > > the commit message widgets without usi

Re: feature request, git-gui: add hotkey to toggle amend/new

2019-09-03 Thread David
On Tue, 3 Sep 2019 at 22:45, Pratyush Yadav wrote: > > Can you try doing a Shift+Tab? For me on Linux, if I hit Shift+Tab, it > immediately takes me to the "Amend last commit" option. Then I can press > space to select it and Tab again to get back to the commit message. Hi Pratyush Yadav, Yes, w

Failure to fetch submodule with --depth=1 parameter

2019-09-03 Thread Grigory Yakushev
$ git --version git version 2.17.1 Repro: $ git clone https://github.com/PX4/Firmware.git $ cd Firmware $ git submodule update --init --recursive --depth=1 ... error: Server does not allow request for unadvertised object 22df9475ca0d157e2db066a20f64c35906bf7f25 Fetched in submodule path 'Tools/sit

[PATCH] git-gui: use path name instead of list index to track last clicked file

2019-09-03 Thread Pratyush Yadav
Birger, You would probably want to squash this patch with yours when you send a re-roll. Of course, I'd like some comments and tests on the patch before considering it "done". Just letting you know that I'd like to have this change in your original patch/commit, not as a separate commit. I put it

Re: [PATCH] [PATCH] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Pratyush Yadav
On 02/09/19 09:42PM, Bert Wesarg wrote: > On Sun, Sep 1, 2019 at 9:37 PM Birger Skogeng Pedersen > wrote: > > > > The user cannot change focus between the list of files, the diff view and > > the commit message widgets without using the mouse (clicking either of > > the four widgets). > > > > With

Re: [PATCH] [PATCH] git-gui: Add hotkeys to set widget focus

2019-09-03 Thread Birger Skogeng Pedersen
Hi Bert, On Mon, Sep 2, 2019 at 9:42 PM Bert Wesarg wrote: > So we only remember the lno in the widget, that could mean, that we > select the wrong file after a rescan, which shifted the previous path > one down. Can we remember the pathname instead, and try to find this > again in the file list

Re: Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Σταύρος Ντέντος
Hey Taylor, This was happening on a (much) more massive repository; I simply tried to dumb down the example. The original folder did had a folder structure 3 levels deep. Unfortunately, I don't remember if the leaves were files (or directories themselves). However, since I "replicated" it, I went

Re: feature request, git-gui: add hotkey to toggle amend/new

2019-09-03 Thread Birger Skogeng Pedersen
Hi Pratyush, On Tue, Sep 3, 2019 at 2:45 PM Pratyush Yadav wrote: > Can you try doing a Shift+Tab? For me on Linux, if I hit Shift+Tab, it > immediately takes me to the "Amend last commit" option. Then I can press > space to select it and Tab again to get back to the commit message. It seems th

Re: [PATCH v4 08/24] Ensure index matches head before invoking merge machinery, round N

2019-09-03 Thread Johannes Schindelin
Hi Elijah, On Tue, 3 Sep 2019, Johannes Schindelin wrote: > On Sat, 17 Aug 2019, Elijah Newren wrote: > > > * t3030-merge-recursive.h: this test has always been broken in that it > > didn't make sure to make index match head before running. But, it > > didn't care about the index or ev

Re: Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Taylor Blau
Hi, On Tue, Sep 03, 2019 at 03:44:14PM +0300, Σταύρος Ντέντος wrote: > Hello there, > > While the name is obviously a mistake, git refuses to even acknowledge > the directory. > > ``` > u@h:~/$ mkdir init-test > u@h:~/$ cd init-test > u@h:~/init-test$ git init > Initialized empty Git repository in

Re: [PATCH] rebase: introduce --update-branches option

2019-09-03 Thread Johannes Schindelin
Hi Warren, On Mon, 2 Sep 2019, Warren He wrote: > Rebasing normally updates the current branch to the rewritten version. > If any other branches point to commits rewritten along the way, those > remain untouched. This commit adds an `--update-branches` option, which > instructs the command to upd

Hello

2019-09-03 Thread John Harold
Hello get back to me urgently

Re: How to track history of personal changes in a repository?

2019-09-03 Thread Matthew McClure
On Sat, Aug 31, 2019 at 09:32 Philip Oakley wrote: > > > The `assume-unchanged bit` is commonly miss-construed as a promise by > Git that it will ignore changes to the file. Maybe `--skip-worktree` would be more appropriate.

Re: feature request, git-gui: add hotkey to toggle amend/new

2019-09-03 Thread Pratyush Yadav
On 03/09/19 07:37AM, Birger Skogeng Pedersen wrote: > On Mon, Sep 2, 2019 at 10:15 PM Bert Wesarg > wrote: > > does Control-Tab works for traversal? > > > Bert, > > Control+Tab works for traversal, but as a means to toggle new/amend > it's very tedious. I have to press Ctrl+Tab 9 times to sele

Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Σταύρος Ντέντος
Hello there, While the name is obviously a mistake, git refuses to even acknowledge the directory. ``` u@h:~/$ mkdir init-test u@h:~/$ cd init-test u@h:~/init-test$ git init Initialized empty Git repository in /home/u/init-test/.git/ u@h:~/init-test$ (master #) mkdir \$\{sys\:DATA_ROOT_DIR\}/ u@h

Re: [PATCH] rebase: introduce --update-branches option

2019-09-03 Thread Phillip Wood
Hi Warren On 03/09/2019 00:41, Warren He wrote: Sometimes people have to rebase multiple related branches. One way to do that quickly, when there are branches pointing to ancestors of a later branch (which happens a lot if you try hard to pad your PR count on GitHub--I mean if you try to make sm

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

2019-09-03 Thread Johannes Schindelin
Hi Junio, On Mon, 2 Sep 2019, Junio C Hamano wrote: > Phillip Wood writes: > > >>for (p1 = label.buf; *p1; p1++) > >> - if (isspace(*p1)) > >> + if (!(*p1 & 0x80) && !isalnum(*p1)) > >>*(char *)p1 = '-'; > > > > I'm sightl

Re: [PATCH] Add hotkey to toggle "Amend Last Commit" radio selector

2019-09-03 Thread Bert Wesarg
David, On Tue, Sep 3, 2019 at 10:52 AM Bert Wesarg wrote: > > Birger, > > On Mon, Sep 2, 2019 at 9:56 PM Birger Skogeng Pedersen > wrote: > > > > Selecting whether to do a "New Commit" or "Amend Last Commit" does not have > > a hotkey. > > > > With this patch, the user may toggle between the two

Re: [BUG] You can't have single quote in your username

2019-09-03 Thread Michal Suchánek
On Tue, 3 Sep 2019 07:51:54 + Giuseppe Crinò wrote: > On Mon, Sep 02, 2019 at 12:25:37PM -0700, Junio C Hamano wrote: > > I'd rather leave the sleeping dog lie, if we need to encourage > > people to live in 21st century and step outside US-ASCII to do so, > > then do that instead. > > +1 t

Re: [PATCH] Add hotkey to toggle "Amend Last Commit" radio selector

2019-09-03 Thread Bert Wesarg
Birger, On Mon, Sep 2, 2019 at 9:56 PM Birger Skogeng Pedersen wrote: > > Selecting whether to do a "New Commit" or "Amend Last Commit" does not have > a hotkey. > > With this patch, the user may toggle between the two options with > CTRL/CMD+e. David A. (in Cc from git-cola) suggested, that we

Re: feature request, git-gui: add hotkey to toggle amend/new

2019-09-03 Thread Bert Wesarg
David, On Tue, Sep 3, 2019 at 3:01 AM David wrote: > > On Tue, 3 Sep 2019 at 04:11, Bert Wesarg wrote: > > On Mon, Sep 2, 2019 at 6:25 PM Birger Skogeng Pedersen > > wrote: > > > On Sat, Aug 31, 2019 at 12:51 PM Birger Skogeng Pedersen > > > wrote: > > > > > In my pursuit to fully utilize gi

Re: [BUG] You can't have single quote in your username

2019-09-03 Thread Giuseppe Crinò
On Mon, Sep 02, 2019 at 12:25:37PM -0700, Junio C Hamano wrote: > I'd rather leave the sleeping dog lie, if we need to encourage > people to live in 21st century and step outside US-ASCII to do so, > then do that instead. +1 to let the sleeping dog lie. When you say we should encourage people to s

Re: [RFC] Post/tutorial for newcomers

2019-09-03 Thread Olga Telezhnaya
вт, 3 сент. 2019 г. в 05:32, Matheus Tavares Bernardino : > > Hi, everyone > > I've been writing a blog post based on what I learned during GSoC to > help other students here at FLUSP[1] start contributing as well. > > In the meantime `Documentation/MyFirstContribution.txt` was released, > so I've

Re: [RFC] Post/tutorial for newcomers

2019-09-03 Thread pedro rijo
Hey Matheus, Just gave a quick look at your post, and I find it awesome! I think it covers most of the pains new contributors may have. Great initiative! It may be interesting to add a link on https://git-scm.com/community, what do you think @peff ? Thanks, Pedro Matheus Tavares Bernardino es