[GIT PULL] gitk update

2019-09-15 Thread Paul Mackerras
Hi Junio, Whenever it's convenient, please do a pull from my gitk repository at git://ozlabs.org/~paulus/gitk.git to get four commits updating gitk. Thanks, Paul. Gabriele Mazzotta (1): gitk: Do not mistake unchanged

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-09-15 Thread Birger Skogeng Pedersen
changes in the repo) - Realize that you forgot something, jump back to the IDE and make some more changes - Jump back again to git-gui, hit refresh In this scenario, I imagine the user would want to have focus kept on the "Unstaged Changes" widget. Even if it became empty with files befo

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-14 Thread David
you lose that information. Are you and other people willing to lose that > information. > > Though I've personally never been a huge fan of those icons. They never > really managed to convey too much meaning to me. So I won't mind > changing them to something like the single-le

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-14 Thread David
er just to explore an idea to see what others think of it. Some days I have good ideas, other days my ideas have flaws that I missed, so I like to discuss first. More important, I want to say that I am very happy to see that there are folks interested to discuss the Tcl/Tk git GUI tools. In fact I have

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-09-14 Thread Pratyush Yadav
o skip step 2. When the user > > stages the last file in the "Unstaged Changes" widget, no file is > > selected and the diff view becomes blank. When this is the case, I > > would prefer that git-gui automatically selects one of the staged > > files and shows

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-09-14 Thread Johannes Sixt
Am 14.09.19 um 23:15 schrieb Pratyush Yadav: > On 14/09/19 02:24PM, Birger Skogeng Pedersen wrote: >> When the user >> stages the last file in the "Unstaged Changes" widget, no file is >> selected and the diff view becomes blank. When this is the case, I >> wo

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-14 Thread Pratyush Yadav
On 15/09/19 01:57AM, David wrote: > On Sat, 14 Sep 2019 at 08:07, Marc Branchaud wrote: > > On 2019-09-13 10:32 a.m., Pratyush Yadav wrote: > > > On 13/09/19 12:24PM, Allan Ford wrote: > > > >> Not a bug, but a suggestion consideration for “Git Gui” > > &

Re: git-gui: automatically move focus to staged file before typing commit message?

2019-09-14 Thread Pratyush Yadav
get, no file is > selected and the diff view becomes blank. When this is the case, I > would prefer that git-gui automatically selects one of the staged > files and shows it in the diff widget before I type up my commit > message. Naturally, this automatic selection should **only** happen >

Re: Git versioning policy - PatchMyPC compatibility on Windows

2019-09-14 Thread Philip Oakley
On 14/09/2019 20:38, brian m. carlson wrote: On 2019-09-14 at 12:49:40, Audric GUERIN wrote: Hi, I use PatchMyPC to keep all my applications up to date on Windows but there is one application that is never properly detected as up to date... and it is Git as you guessed. According to Justin

Re: Git versioning policy - PatchMyPC compatibility on Windows

2019-09-14 Thread brian m. carlson
On 2019-09-14 at 12:49:40, Audric GUERIN wrote: > Hi, > > I use PatchMyPC to keep all my applications up to date on Windows but there > is one application that is never properly detected as up to date... and it > is Git as you guessed. > > According to Justin Chalfant, Direc

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-14 Thread Pratyush Yadav
. I don't think there is any way of finding out the default terminal emulator in Linux, and I don't think there is a standard way of making terminal emulator launch programs you want. So your suggestion works only for GUI based editors. We would have to mention that only GUI based editors

Re: [PATCH v5] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-14 Thread Pratyush Yadav
gt; Selecting whether to "Amend Last Commit" or not does not have a hotkey. > > With this patch, the user may toggle between the two options with > CTRL/CMD+e. > > Signed-off-by: Birger Skogeng Pedersen > Rebased-by: Bert Wesarg > --- > git-gui.sh | 8 >

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-14 Thread David
On Sat, 14 Sep 2019 at 06:51, Bert Wesarg wrote: > On Fri, Sep 13, 2019 at 4:32 PM Pratyush Yadav wrote: > > On 13/09/19 12:24PM, Allan Ford wrote: > > I miss a general problem description: Whats wrong with the > single-click on the icon to begin with? No problem here, but see my other message f

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-14 Thread David
On Sat, 14 Sep 2019 at 08:07, Marc Branchaud wrote: > On 2019-09-13 10:32 a.m., Pratyush Yadav wrote: > > On 13/09/19 12:24PM, Allan Ford wrote: > >> Not a bug, but a suggestion consideration for “Git Gui” > >> Can a double click on the file name in the “unstaged”

Git versioning policy - PatchMyPC compatibility on Windows

2019-09-14 Thread Audric GUERIN
Hi, I use PatchMyPC to keep all my applications up to date on Windows but there is one application that is never properly detected as up to date... and it is Git as you guessed. According to Justin Chalfant, Director of Engineering of PatchMyPC, Git version "number" / identif

git-gui: automatically move focus to staged file before typing commit message?

2019-09-14 Thread Birger Skogeng Pedersen
o the "Commit Message" widget to type up my commit message. Basically, I would like to be able to skip step 2. When the user stages the last file in the "Unstaged Changes" widget, no file is selected and the diff view becomes blank. When this is the case, I would prefer that git-gui aut

[PATCH v5] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-14 Thread Birger Skogeng Pedersen
Selecting whether to "Amend Last Commit" or not does not have a hotkey. With this patch, the user may toggle between the two options with CTRL/CMD+e. Signed-off-by: Birger Skogeng Pedersen Rebased-by: Bert Wesarg --- git-gui.sh | 8 1 file changed, 8 insertions(+) diff -

Re: [PATCH v4] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-14 Thread Birger Skogeng Pedersen
Thanks, I really appreciate you taking time to explain it thoroughly. On Sat, Sep 14, 2019 at 12:11 AM Pratyush Yadav wrote: > So while my advice above was to work on top of "master", that does not > apply in this case since your patch is dependent on someone's patch > which isn't in master yet.

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-14 Thread Johannes Sixt
Am 13.09.19 um 16:32 schrieb Pratyush Yadav: > Is partial single and partial double click behaviour acceptable? Or > should we make the entire row double click only? Or something else that > I missed? I don't mind adding the suggested double-click action, but removing the single-click action wou

[RFC PATCH v3 1/3] docs: mention trace2 target-dir mode in git-config

2019-09-13 Thread Josh Steadmon
Move the description of trace2's target-directory behavior into the shared trace2-target-values file so that it is included in both the git-config and api-trace2 docs. Leave the SID discussion only in api-trace2 since it's a technical detail. Signed-off-by: Josh Steadmon --- Doc

Re: [PATCH] git-submodule.txt: fix AsciiDoc formatting error

2019-09-13 Thread Junio C Hamano
Denton Liu writes: >> > -set-branch ((-d|--default)|(-b|--branch )) [--] :: >> >> I say "almost", as it gives a wrong impression that you can give >> "-b" without "" X-<. >> >> Now what does the updated text say to us? >> >> > +set-branch (-d|--default)|(-b|--branch ) [--] :: >> >> I think th

Re: git-am fails for emails with UTF8 characters in email header

2019-09-13 Thread brian m. carlson
On 2019-09-13 at 20:07:24, Siddharth Chandrasekaran wrote: > Hi Junio, > > My email server (zoho) puts leading UTF-8 non-breaking spaces ("\xC2\xA0") > when folding long mail headers. Due to this, git-am is failing as it expects > only '\t' or ' '

Re: [PATCH v4] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Pratyush Yadav
ing on an older version of this patch. You should > > be re-rolling [0], which works well with Bert's "amend check button" > > change. > > > > [0] > > https://public-inbox.org/git/b82a00441ff1a6a9cea3fd235c1c33729ec31b71.1567713659.git.bert.wes...@goog

Re: [PATCH] git-submodule.txt: fix AsciiDoc formatting error

2019-09-13 Thread Denton Liu
ve > "-b" without "" X-<. > > Now what does the updated text say to us? > > > +set-branch (-d|--default)|(-b|--branch ) [--] :: > > I think the attempt to cram the short-form is unnecessarily > cluttering and making the result incorrect. How about doing

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Marc Branchaud
On 2019-09-13 10:32 a.m., Pratyush Yadav wrote: On 13/09/19 12:24PM, Allan Ford wrote: Dear Git Authors, Not a bug, but a suggestion consideration for “Git Gui” Can a double click on the file name in the “unstaged” area move the item to “staged changes” .. (rather than having to click on the

Re: [PATCH v4] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Birger Skogeng Pedersen
On Fri, Sep 13, 2019 at 4:37 PM Pratyush Yadav wrote: > Hi Birger, > > I'm afraid you are working on an older version of this patch. You should > be re-rolling [0], which works well with Bert's "amend check button" > change. >

[PATCH v4] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Birger Skogeng Pedersen
Selecting whether to "Amend Last Commit" or not does not have a hotkey. With this patch, the user may toggle between the two options with CTRL/CMD+e. Signed-off-by: Birger Skogeng Pedersen Rebased-by: Bert Wesarg --- git-gui.sh | 9 + 1 file changed, 9 insertions(+) diff -

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Pratyush Yadav
On 13/09/19 10:27PM, Bert Wesarg wrote: > On Fri, Sep 13, 2019 at 4:32 PM Pratyush Yadav wrote: > > > > On 13/09/19 12:24PM, Allan Ford wrote: > > > Dear Git Authors, > > > > > > Not a bug, but a suggestion consideration for “Git Gui” > > &g

Re: Git in Outreachy December 2019?

2019-09-13 Thread Jeff King
On Fri, Sep 13, 2019 at 01:03:17PM -0700, Jonathan Tan wrote: > > Do we have interested mentors for the next round of Outreachy? > > > > The deadline for Git to apply to the program is September 5th. The > > deadline for mentors to have submitted project descriptio

Re: [PATCH v4] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Pratyush Yadav
g on. Now > there is a horizontal scrollbar. > > There seems to be a bug in at least Tcl/Tk up to version 8.6.8, which > does not update the horizontal scrollbar if one removes the whole > content at once. > > Suggested-by: Birger Skogeng Pedersen > Signed-off-by: Ber

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Bert Wesarg
On Fri, Sep 13, 2019 at 4:32 PM Pratyush Yadav wrote: > > On 13/09/19 12:24PM, Allan Ford wrote: > > Dear Git Authors, > > > > Not a bug, but a suggestion consideration for “Git Gui” > > > > Can a double click on the file name in the “unstaged” area

Re: [PATCH 1/1] multi-pack-index: add --no-progress Add --no-progress option to git multi-pack-index. The progress feature was added in 144d703 ("multi-pack-index: report progress during 'verify'", 20

2019-09-13 Thread Junio C Hamano
dispatch (it directly makes underlying API calls instead). Started as an isolated experimental command whose existence as a standalone command is solely because it was easier to experiment with (as opposed to being a plumbing command to be used by scripters), it probably was an acceptable trade-of

Re: [PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-13 Thread Bert Wesarg
On Fri, Sep 13, 2019 at 9:49 PM Pratyush Yadav wrote: > > You missed fixing the typo in the subject. s/checketton/checkbutton/. > But no need to send a re-roll for that. I can fix it locally. thanks, I also fixed that locally, but again, it slipped thru in the patch mail. Still don't know why thi

[PATCH v4] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Bert Wesarg
version 8.6.8, which does not update the horizontal scrollbar if one removes the whole content at once. Suggested-by: Birger Skogeng Pedersen Signed-off-by: Bert Wesarg --- git-gui.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index 5bc21b8..ad962d4 100755 --- a

Re: [PATCH] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Bert Wesarg
> patches. > > You can do this by passing "-v2" (or "-v3", "-v4", etc) to > git-send-email or git-format-patch. > > You missed two quick questions I had in the last version. I'll ask them > again below. Other than those two, LGTM. Thanks. I re

git-am fails for emails with UTF8 characters in email header

2019-09-13 Thread Siddharth Chandrasekaran
Hi Junio, My email server (zoho) puts leading UTF-8 non-breaking spaces ("\xC2\xA0") when folding long mail headers. Due to this, git-am is failing as it expects only '\t' or ' ' characters. RFC2822 [1] on page 7 states: > The general rule is that wherever this

Re: Git in Outreachy December 2019?

2019-09-13 Thread Jonathan Tan
> Do we have interested mentors for the next round of Outreachy? > > The deadline for Git to apply to the program is September 5th. The > deadline for mentors to have submitted project descriptions is September > 24th. Intern applications would start on October 1st. > > If

Re: [PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-13 Thread Pratyush Yadav
You missed fixing the typo in the subject. s/checketton/checkbutton/. But no need to send a re-roll for that. I can fix it locally. Other than that, LGTM. Thanks, will queue. On 13/09/19 08:02AM, Bert Wesarg wrote: > Its a bi-state anyway and also saves one line in the menu. > > Signed-off-by:

Re: [PATCH] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Pratyush Yadav
Can you please add a version number when you send re-rolls the next time around. Something like "[PATCH v2] subject...". Makes it easier for me to keep track of things when there are multiple re-rolls of multiple patches. You can do this by passing "-v2" (or "-v3&q

Re: [PATCH 1/1] multi-pack-index: add --no-progress Add --no-progress option to git multi-pack-index. The progress feature was added in 144d703 ("multi-pack-index: report progress during 'verify'", 20

2019-09-13 Thread William Baker
Hi Junio, Thanks for the review! On 9/12/19 1:17 PM, Junio C Hamano wrote: >> +'git multi-pack-index' [--object-dir=] [--[no-]progress] > > I am wondering what the reasoning behind having this new one *after* > the subcommand while the existing one *before* is. Is

Re: [PATCH] git-submodule.txt: fix AsciiDoc formatting error

2019-09-13 Thread Junio C Hamano
cram the short-form is unnecessarily cluttering and making the result incorrect. How about doing something like this instead? Documentation/git-submodule.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodul

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-13 Thread Pratyush Yadav
s that Caps Lock is equivalent to having the shift on, > > rather than being a special extra key. > > It seems all the Ctrl+(lowercase character) hotkeys in git-gui have an > equivalent Ctrl+(uppercase character). > So for this feature, we should keep the Ctrl+E bind aswell as the > C

Re: [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton

2019-09-13 Thread Pratyush Yadav
On 12/09/19 09:35PM, Bert Wesarg wrote: > On Wed, Sep 11, 2019 at 10:15 PM Pratyush Yadav > wrote: > > > > Typo in the subject. s/checketton/checkbutton/ > > > > On 05/09/19 10:09PM, Bert Wesarg wrote: > > > diff --git a/lib/index.tcl b/lib/index.

Re: [PATCH v3] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Pratyush Yadav
Hi Birger, I'm afraid you are working on an older version of this patch. You should be re-rolling [0], which works well with Bert's "amend check button" change. [0] https://public-inbox.org/git/b82a00441ff1a6a9cea3fd235c1c33729ec31b71.1567713659.git.bert.wes...@googlemail.

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Pratyush Yadav
On 13/09/19 12:24PM, Allan Ford wrote: > Dear Git Authors, > > Not a bug, but a suggestion consideration for “Git Gui” > > Can a double click on the file name in the “unstaged” area move the > item to “staged changes” .. (rather than having to click on the small > icon to

Re: RFC - Git Developer Blog

2019-09-13 Thread pedro rijo
Just a minor question: since we have git-scm, pro-git, and git translations in github, why not keep in the same place, under the same organization? I just find it easier to find than having repos scattered across different git hosting services James Ramsay escreveu no dia sexta, 13/09/2019 à(s

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-13 Thread Marc Branchaud
assumes that Caps Lock is equivalent to having the shift on, rather than being a special extra key. It seems all the Ctrl+(lowercase character) hotkeys in git-gui have an equivalent Ctrl+(uppercase character). So for this feature, we should keep the Ctrl+E bind aswell as the Ctrl+e bind. If nothing else, t

Re: Virtual Git Contributor Summit

2019-09-13 Thread James Ramsay
On 3 Jul 2019, at 9:01, Johannes Schindelin wrote: Team, I kept talking about this idea of a purely online Git Contributor Summit, and it is finally time for action. Thank you for organizing! Yesterday, Christian and I took notes in the doc below which might be useful for others. https

Re: RFC - Git Developer Blog

2019-09-13 Thread James Ramsay
On 6 Aug 2019, at 16:49, Emily Shaffer wrote: On Tue, Aug 06, 2019 at 09:20:52AM -0400, Jeff King wrote: On Mon, Aug 05, 2019 at 06:49:35PM -0700, Emily Shaffer wrote: Are folks interested in writing and reviewing this kind of content? Any ideas for where we may be able to host (maybe git

[PATCH v3] git-svn: trim leading and trailing whitespaces in author name

2019-09-13 Thread Tobias Klauser
ix this by trimming the author name retreived from svn before using it in check_author. Signed-off-by: Tobias Klauser --- v3: - check author string length after whitespace trimming - trim leading and trailing whitespaces in two separate steps perl/Git/SVN.pm | 4 1 file changed, 4 insertion

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-13 Thread Birger Skogeng Pedersen
plement of the unshifted action, so it does feel 'odd'. Thus it could > be used directly as the bool for amend or direct commit. > > This all assumes that Caps Lock is equivalent to having the shift on, > rather than being a special extra key. It seems all the Ctrl+(lowercase c

Re: [PATCH v2] git-svn: trim leading and trailing whitespaces in author name

2019-09-13 Thread Tobias Klauser
Thank you for the review Eric! On 2019-09-12 at 20:20:11 +0200, Eric Sunshine wrote: > On Thu, Sep 12, 2019 at 10:56 AM Tobias Klauser wrote: > > v2: > > - move whitespace trimming below defined'ness check as per Eric Sunshine's > > review comment > > di

[PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
Its a bi-state anyway and also saves one line in the menu. Signed-off-by: Bert Wesarg --- git-gui.sh | 36 +--- lib/checkout_op.tcl | 6 +++--- lib/commit.tcl | 4 ++-- lib/index.tcl | 8 4 files changed, 18 insertions(+), 36

Re: Patching Git to handle dates before the Unix epoch

2019-09-12 Thread Jeff King
plementations do with a commit > > object that contains a negative timestamp? > > Negative timestamps can already be created, because some Git libraries can > create such objects, and one can also create them by hand; see > http://git.661346.n2.nabble.com/Back-dating-commits-way-

Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-12 Thread Allan Ford
Dear Git Authors, Not a bug, but a suggestion consideration for “Git Gui” Can a double click on the file name in the “unstaged” area move the item to “staged changes” .. (rather than having to click on the small icon to the left of the file name?) cheers, Allan

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-12 Thread Philip Oakley
with/without Caps Lock enabled. With that in mind, we should probably bind Ctrl+E aswell. Nice catch! Makes sense to have the same behaviour for both caps lock enabled and disabled. (I've been a git-gui user for many years...) I disagree!  Who expects anything to work properly when caps

Re: [PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Philip Oakley
On 12/09/2019 20:44, Bert Wesarg wrote: Its a bi-state anyway and also safes one line in the menu. s/safes/saves/  ? Signed-off-by: Bert Wesarg --- Philip

[PATCH v3 10/12] clean: avoid removing untracked files in a nested git repository

2019-09-12 Thread Elijah Newren
Users expect files in a nested git repository to be left alone unless sufficiently forced (with two -f's). Unfortunately, in certain circumstances, git would delete both tracked (and possibly dirty) files and untracked files within a nested repository. To explain how this happens, let'

[PATCH v3 00/12] Fix some git clean issues

2019-09-12 Thread Elijah Newren
ago. This patch series fixes a few issues with git-clean: * Failure to clean when multiple pathspecs are specified, reported both in April 2018[1] and again in May 2019[2]. * Failure to preserve both tracked and untracked files within a nested Git repository reported a few weeks ago by

[PATCH v3 08/12] git-clean.txt: do not claim we will delete files with -n/--dry-run

2019-09-12 Thread Elijah Newren
It appears that the wrong option got included in the list of what will cause git-clean to actually take action. Correct the list. Signed-off-by: Elijah Newren --- Documentation/git-clean.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-clean.txt b

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-12 Thread Marc Branchaud
upper-case letters, to have the same behaviour with/without Caps Lock enabled. With that in mind, we should probably bind Ctrl+E aswell. Nice catch! Makes sense to have the same behaviour for both caps lock enabled and disabled. (I've been a git-gui user for many years...) I disagree! Who e

Re: [PATCH 1/1] multi-pack-index: add --no-progress Add --no-progress option to git multi-pack-index. The progress feature was added in 144d703 ("multi-pack-index: report progress during 'verify'", 20

2019-09-12 Thread Junio C Hamano
"William Baker via GitGitGadget" writes: > [verse] > -'git multi-pack-index' [--object-dir=] > +'git multi-pack-index' [--object-dir=] [--[no-]progress] I am wondering what the reasoning behind having this new one *after* the subcommand while the exi

[PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
Its a bi-state anyway and also safes one line in the menu. Signed-off-by: Bert Wesarg --- git-gui.sh | 36 +--- lib/checkout_op.tcl | 6 +++--- lib/commit.tcl | 4 ++-- lib/index.tcl | 8 4 files changed, 18 insertions(+), 36

Re: [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
On Wed, Sep 11, 2019 at 10:15 PM Pratyush Yadav wrote: > > Typo in the subject. s/checketton/checkbutton/\ Will re-roll and drop the actual keybinding patch, so that Birger can resend his part, Bert > > On 05/09/19 10:09PM, Bert Wesarg wrote: > > Signed-off-by: Bert Wesarg

Re: [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Bert Wesarg
On Wed, Sep 11, 2019 at 10:15 PM Pratyush Yadav wrote: > > Typo in the subject. s/checketton/checkbutton/ > > On 05/09/19 10:09PM, Bert Wesarg wrote: > > Signed-off-by: Bert Wesarg > > --- > > git-gui.sh | 36 +---

Re: [PATCH 1/2] git-gui: warn if the commit message contains lines longer than the set limit

2019-09-12 Thread Bert Wesarg
in the GUI. Now we also check the commit message at commit > > time for long lines and ask the author for confirmation if it exceeds the > > configured line length. > > > > Needs Tcl 8.6 because of `lmap`. > > > > Signed-off-by: Bert Wesarg > > --- > > g

[PATCH] git-gui: add horizontal scrollbar to commit buffer

2019-09-12 Thread Bert Wesarg
version 8.6.8, which does not update the horizontal scrollbar if one removes the whole content at once. Suggested-by: Birger Skogeng Pedersen Signed-off-by: Bert Wesarg --- git-gui.sh | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 5bc21b8

Re: [PATCH 1/2] git-gui: warn if the commit message contains lines longer than the set limit

2019-09-12 Thread Bert Wesarg
On Tue, Sep 10, 2019 at 10:35 PM Pratyush Yadav wrote: > > On 04/09/19 10:10PM, Bert Wesarg wrote: > > The commit message widget does not wrap the next and has a configurable > > fixed width to avoid creating too wide commit messages. Though this was > > only enforced in the GUI. Now we also check

Re: [PATCH 2/2] git-gui: add horizontal scrollbar to commit buffer

2019-09-12 Thread Bert Wesarg
have fixed this typo there. > > > There seems to be a bug in at least up to Tcl/Tk 8.6.8, which does not > > update the horizontal scrollbar if one removes the whole content at once. > > > > Suggested-by: Birger Skogeng Pedersen > > Signed-off-by: Bert Wesarg >

Re: [PATCH v3 0/4] git-gui: Add ability to revert selected hunks and lines

2019-09-12 Thread Bert Wesarg
On Tue, Sep 10, 2019 at 10:26 PM Johannes Sixt wrote: > > Am 10.09.19 um 21:21 schrieb Pratyush Yadav: > > If there are no further objections with the series, I will merge it in. > > No objections. I use it in production. yep, Since 2012 ;-) > > -- Hannes

[PATCH v3] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-12 Thread Birger Skogeng Pedersen
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. Signed-off-by: Birger Skogeng Pedersen Signed-off-by: Bert Wesarg

Re: [PATCH v2] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Eric Sunshine
On Thu, Sep 12, 2019 at 10:56 AM Tobias Klauser wrote: > v2: > - move whitespace trimming below defined'ness check as per Eric Sunshine's >review comment > diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm > @@ -1494,6 +1494,7 @@ sub check_author { > if

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-12 Thread Pratyush Yadav
On 12/09/19 08:05AM, Birger Skogeng Pedersen wrote: > Hi Pratyush, > > On Wed, Sep 11, 2019 at 10:55 PM Pratyush Yadav > wrote: > > Also, I notice that the bindings for other letters have the same > > function bound for both small and capital letters (IOW, same behavior > > with shift held and r

[PATCH v2] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Tobias Klauser
ix this by trimming the author name retreived from svn before using it in check_author. Signed-off-by: Tobias Klauser --- v2: - move whitespace trimming below defined'ness check as per Eric Sunshine's review comment perl/Git/SVN.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/pe

Re: [PATCH] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Tobias Klauser
gt;not defined in authors.txt > > > > (the trailing newline leads to the line break). The user "user1" is > > defined in authors.txt though, e.g. > > > > user1 = User > > > > Fix this by trimming the author name retreived from svn before using it

Re: [PATCH] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Eric Sunshine
. The user "user1" is > defined in authors.txt though, e.g. > > user1 = User > > Fix this by trimming the author name retreived from svn before using it > in check_author. > > Signed-off-by: Tobias Klauser > --- > diff --git a/perl/Git/SVN.pm b/perl/Git/

[PATCH] git-svn: trim leading and trailing whitespaces in author name

2019-09-12 Thread Tobias Klauser
ix this by trimming the author name retreived from svn before using it in check_author. Signed-off-by: Tobias Klauser --- perl/Git/SVN.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 76b29659057d..db412c653d1d 100644 --- a/perl/Git/SVN.pm +++ b/perl/

Re: error: could not read '.git/rebase-apply/head-name': No such file or directory

2019-09-12 Thread Johannes Schindelin
Hi Eugen, On Thu, 12 Sep 2019, Eugen Konkov wrote: > $ git --version > git version 2.20.1 First thing to try is whether Git v2.23.0 still exposes that bug. Ciao, Johannes

error: could not read '.git/rebase-apply/head-name': No such file or directory

2019-09-12 Thread Eugen Konkov
Hello Git, Next commands cause the error: $ git pull fatal: It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case, please try git rebase (--continue | --abort | --skip) If that is not the case, please

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-11 Thread Birger Skogeng Pedersen
Hi Pratyush, On Wed, Sep 11, 2019 at 10:55 PM Pratyush Yadav wrote: > Also, I notice that the bindings for other letters have the same > function bound for both small and capital letters (IOW, same behavior > with shift held and released). > > I don't necessarily think that is a great idea. It is

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-11 Thread Pratyush Yadav
geng Pedersen > > Selecting whether to "Amend Last Commit" or not does not have a hotkey. > > With this patch, the user may toggle between the two options with > CTRL/CMD+e. > > Signed-off-by: Birger Skogeng Pedersen > Rebased-by: Bert Wesarg > --- > git-gui.sh | 8

Re: [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton

2019-09-11 Thread Pratyush Yadav
Typo in the subject. s/checketton/checkbutton/ On 05/09/19 10:09PM, Bert Wesarg wrote: > Signed-off-by: Bert Wesarg > --- > git-gui.sh | 36 +--- > lib/checkout_op.tcl | 6 +++--- > lib/commit.tcl | 4 ++-- > lib/index.tcl

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

2019-09-11 Thread Pratyush Yadav
On 12/09/19 12:04AM, Pratyush Yadav wrote: > On 11/09/19 12:27PM, Birger Skogeng Pedersen wrote: > > Hi Pratyush, > > > > I'm hoping this will be merged, even without changing the radio > > selectors to a checkbox(?). The patch from Bert resolves the issue I > > raised about wanting the hotkey. >

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

2019-09-11 Thread Pratyush Yadav
e based on the discussion, but I don't think it should affect your change too much. [0] https://public-inbox.org/git/20190904175943.11924-1-birger...@gmail.com/ [1] https://public-inbox.org/git/ab1f68cc8552e405c9d04622be1e728ab81bda17.1567713659.git.bert.wes...@googlemail.com/ -- Regards, Pratyush Yadav

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

2019-09-11 Thread Johannes Sixt
Am 11.09.19 um 19:48 schrieb Pratyush Yadav: > Since this entire debate essentially boils down to personal preference, > there is no clear answer. So I'll just go with the author's > implementation. Fair enough. -- Hannes

Git.pm normalizes $GIT_DIR, was Re: git-send-email does not use conditional configuration

2019-09-11 Thread Jeff King
work the /work folder is actually a > symlink to a different directory. When I did the same at home, I could > reproduce the issue: > > % pwd > /work/repo > % git send-email --dry-run -1 --to nobody | grep ^From > From: Konstantinos Dalamagkidis > % cd ../repo-symlink > % g

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

2019-09-11 Thread Pratyush Yadav
ith the author's implementation. Do note that I fixed a small nitpick locally. Changed the subject from "git-gui: Add..." to "git-gui: add...". > As David A. mentioned in his email[1], git-cola utilizes CTRL+J/K/L > for navigation, maybe we should consider(?): &

Re: git-send-email does not use conditional configuration

2019-09-11 Thread Konstantinos Dalamagkidis
On 9/11/19 4:08 PM, Jeff King wrote: On Wed, Sep 11, 2019 at 08:14:45AM +0200, Konstantinos Dalamagkidis wrote: In my git configuration, I have an includeif section for work related repositories that configures the user and sendemail sections. What kind of includeIf are you using? Does it

[PATCH 1/1] multi-pack-index: add --no-progress Add --no-progress option to git multi-pack-index. The progress feature was added in 144d703 ("multi-pack-index: report progress during 'verify'", 2018-0

2019-09-11 Thread William Baker via GitGitGadget
From: William Baker Signed-off-by: William Baker --- Documentation/git-multi-pack-index.txt | 6 +- builtin/multi-pack-index.c | 14 +--- midx.c | 30 +- midx.h | 6 -- t/t5319

Re: git-send-email does not use conditional configuration

2019-09-11 Thread Jeff King
On Wed, Sep 11, 2019 at 08:14:45AM +0200, Konstantinos Dalamagkidis wrote: > In my git configuration, I have an includeif section for work > related repositories that configures the user and sendemail > sections. What kind of includeIf are you using? Does it work with an unconditiona

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

2019-09-11 Thread Birger Skogeng Pedersen
Hi Pratyush, I'm hoping this will be merged, even without changing the radio selectors to a checkbox(?). The patch from Bert resolves the issue I raised about wanting the hotkey. What do you think? Birger

Fwd: Path instead of pathspec for “git checkout [--] ”

2019-09-11 Thread Bogdan Butnaru
Hello! Not sure if I’m doing something wrong here, but it seems that when calling “git checkout [--] ”, the last argument is not interpreted correctly. I have a repository that contains a multi-module Maven project, and as such it contains several “pom.xml” files, one in the root directory and

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

2019-09-10 Thread Birger Skogeng Pedersen
;t quite follow the argumentation to use Alt+3 for the commit message widget. Is Alt+4 (really) too awkward? And if it is, how is Alt+3 better? If you want to see it merged now (which I do, too), I propose we leave it at Alt+3 for the diff, and Alt+4 for the commit message buffer. As David A. menti

git-send-email does not use conditional configuration

2019-09-10 Thread Konstantinos Dalamagkidis
Hello, In my git configuration, I have an includeif section for work related repositories that configures the user and sendemail sections. I can verify that the configuration is read correctly by git: % git config --get-regex "sendemail.*" sendemail.smtpencryption tls sendemail.

Re: [PATCH 1/2] git-gui: warn if the commit message contains lines longer than the set limit

2019-09-10 Thread Pratyush Yadav
On 04/09/19 10:10PM, Bert Wesarg wrote: > The commit message widget does not wrap the next and has a configurable > fixed width to avoid creating too wide commit messages. Though this was > only enforced in the GUI. Now we also check the commit message at commit > time for long lines and ask the au

Re: [PATCH 2/2] git-gui: add horizontal scrollbar to commit buffer

2019-09-10 Thread Pratyush Yadav
; update the horizontal scrollbar if one removes the whole content at once. > > Suggested-by: Birger Skogeng Pedersen > Signed-off-by: Bert Wesarg > --- > git-gui.sh | 10 -- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/git-gui.sh b/git-gui.sh >

Re: [PATCH v3 0/4] git-gui: Add ability to revert selected hunks and lines

2019-09-10 Thread Johannes Sixt
Am 10.09.19 um 21:21 schrieb Pratyush Yadav: > If there are no further objections with the series, I will merge it in. No objections. I use it in production. -- Hannes

Re: [PATCH 1/2] git-gui: warn if the commit message contains lines longer than the set limit

2019-09-10 Thread Pratyush Yadav
ping can be > > annoying. > > > > I suspect there is a moderately happy medium between the two, perhaps with > > an autowrap key (per paragraph) being available. > > > > I also had it in my head that some parts of Git do allow more than a single > > line hea

Re: [PATCH v3 0/4] git-gui: Add ability to revert selected hunks and lines

2019-09-10 Thread Pratyush Yadav
Johannes, Bert, All, If there are no further objections with the series, I will merge it in. On 29/08/19 03:27AM, Pratyush Yadav wrote: > Hi, > > This series adds the ability to revert selected lines and hunks in > git-gui. Partially based on the patch by Bert Wesarg [0]. > &g

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

2019-09-10 Thread Pratyush Yadav
gt; This enables the user to select/unselect files, view the diff and create a > commit in git-gui using keyboard-only. > > Signed-off-by: Birger Skogeng Pedersen > --- > git-gui.sh | 32 +++++++++++++++- > 1 file changed, 31 insertions(+), 1 deletion(-) >

<    1   2   3   4   5   6   7   8   9   10   >