Re: [PATCH] Add 'raw' blob_plain link in history overview

2017-08-22 Thread Giuseppe Bilotta
On Tue, Aug 22, 2017 at 9:35 PM, Job Snijders wrote: > We often work with very large plain text files in our repositories and > found it friendlier to the users if we can click directly to the raw > version of such files. It might be worth it to add this information to the commit message. -- G

Re: [PATCH] Add 'raw' blob_plain link in history overview

2017-08-21 Thread Giuseppe Bilotta
Hello, On Mon, Aug 21, 2017 at 12:44 PM, Job Snijders wrote: > On Mon, Aug 21, 2017 at 12:19:38PM +0200, Giuseppe Bilotta wrote: > Thank you for your feedback, good point. Please see below: This looks fine > --- > > Add a 'raw' blob_plain link in history overview > &

Re: [PATCH] Add 'raw' blob_plain link in history overview

2017-08-21 Thread Giuseppe Bilotta
Hello, On Sun, Aug 20, 2017 at 8:03 PM, Job Snijders wrote: > bump? (As a side note, I have also noticed that gitweb patches tend to go unreviewed for long) > On Wed, Aug 02, 2017 at 08:59:01PM +0200, Job Snijders wrote: >> We often work with very large plain text files in our repositories and

Re: [PATCH 0/2] gitweb: tags feeds

2017-05-07 Thread Giuseppe Bilotta
Ping? On Wed, Apr 19, 2017 at 8:49 AM, Giuseppe Bilotta wrote: > A smallish patchset to implement RSS and Atom feeds to complement the > tags view, accessible as verbs `tags_rss` and `tags_atom`. > > (I actually made this some 5 years ago, and it has been running on > http:/

[PATCH 1/2] gitweb: infrastructure for tags feed

2017-04-18 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta --- gitweb/gitweb.perl | 79 +++--- 1 file changed, 58 insertions(+), 21 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7cf68f07b7..4adea84006 100755 --- a/gitweb/gitweb.perl +++ b/gitweb

[PATCH 2/2] gitweb: expose tags feed in appropriate places

2017-04-18 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta --- gitweb/gitweb.perl | 47 +-- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 4adea84006..8be7444988 100755 --- a/gitweb/gitweb.perl +++ b/gitweb

[PATCH 0/2] gitweb: tags feeds

2017-04-18 Thread Giuseppe Bilotta
patchset is also available in the git repository at: git://git.oblomov.eu/git gitweb-tags-feed Giuseppe Bilotta (2): gitweb: infrastructure for tags feed gitweb: expose tags feed in appropriate places gitweb/gitweb.perl

[PATCH v4 3/3] rebase: pass --[no-]signoff option to git am

2017-04-18 Thread Giuseppe Bilotta
This makes it easy to sign off a whole patchset before submission. Signed-off-by: Giuseppe Bilotta --- Documentation/git-rebase.txt | 5 + git-rebase.sh| 3 ++- t/t3428-rebase-signoff.sh| 46 3 files changed, 53 insertions

[PATCH v4 2/3] builtin/am: fold am_signoff() into am_append_signoff()

2017-04-18 Thread Giuseppe Bilotta
There are no more direct calls to am_signoff(), so we can fold its logic in am_append_signoff(). (This is done in a separate commit rather than in the previous one, to make it easier to revert this specific change if additional calls are ever introduced.) Signed-off-by: Giuseppe Bilotta

[PATCH v4 0/3] rebase: --signoff support

2017-04-18 Thread Giuseppe Bilotta
`request-pull`.) Some work about extending --signoff support to interactive rebases is underway in the `rebase-signoff-ext` branch, but there's a lot of corner cases to test and work-out, so I guess that'll be fore some other time. Giuseppe Bilotta (3): builtin/am: obey --signoff

[PATCH v4 1/3] builtin/am: obey --signoff also when --rebasing

2017-04-18 Thread Giuseppe Bilotta
gi-am obey it also in the rebase case. This is trivially fixed by moving the conditional addition of the signoff from parse_mail() to the caller am_run(), after either of the parse_mail*() functions were called. Signed-off-by: Giuseppe Bilotta --- builtin/am.c | 6 +++--- 1 file changed, 3

Re: [PATCH 0/3] rebase --signoff

2017-04-18 Thread Giuseppe Bilotta
On Tue, Apr 18, 2017 at 2:14 AM, Junio C Hamano wrote: > Giuseppe Bilotta writes: > >>> - How does this interact with "git rebase -i" and other modes of >>>operation? >> >> A better question would maybe be how do we want this to interact? &

[PATCH] doc: trivial typo in git-format-patch.txt

2017-04-17 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta --- Documentation/git-format-patch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index f7a069bb92..c890328b02 100644 --- a/Documentation/git-format-patch.txt +++ b

Re: [PATCH 0/3] rebase --signoff

2017-04-17 Thread Giuseppe Bilotta
On Mon, Apr 17, 2017 at 9:12 AM, Junio C Hamano wrote: > Two questions. > > - Is it better to add a brand new test script than adding new tests >to existing scripts that test "git rebase"? Since this is a completely (in some sense) new feature, I felt it was appropriate to put all --signoff

Re: [PATCH 3/3] rebase: pass --[no-]signoff option to git am

2017-04-15 Thread Giuseppe Bilotta
Damnit! I just realized that I forgot to amend before the format-patch: On Sat, Apr 15, 2017 at 4:41 PM, Giuseppe Bilotta wrote: > +signoff! passed to 'git am' This should be without the ! or --no-signoff is not accepted. Do I need to resend or ... ?

[PATCH 3/3] rebase: pass --[no-]signoff option to git am

2017-04-15 Thread Giuseppe Bilotta
This makes it easy to sign off a whole patchset before submission. Signed-off-by: Giuseppe Bilotta --- Documentation/git-rebase.txt | 5 + git-rebase.sh| 3 ++- t/t3428-rebase-signoff.sh| 46 3 files changed, 53 insertions

[PATCH 1/3] builtin/am: obey --signoff also when --rebasing

2017-04-15 Thread Giuseppe Bilotta
gi-am obey it also in the rebase case. This is trivially fixed by moving the conditional addition of the signoff from parse_mail() to the caller am_run(), after either of the parse_mail*() functions were called. Signed-off-by: Giuseppe Bilotta --- builtin/am.c | 6 +++--- 1 file changed, 3

[PATCH 2/3] builtin/am: fold am_signoff() into am_append_signoff()

2017-04-15 Thread Giuseppe Bilotta
There are no more direct calls to am_signoff(), so we can fold its logic in am_append_signoff(). (This is done in a separate commit rather than in the previous one, to make it easier to revert this specific change if additional calls are ever introduced.) Signed-off-by: Giuseppe Bilotta

[PATCH 0/3] rebase --signoff

2017-04-15 Thread Giuseppe Bilotta
gnoff and its negation. Giuseppe Bilotta (3): builtin/am: obey --signoff also when --rebasing builtin/am: fold am_signoff() into am_append_signoff() rebase: pass --[no-]signoff option to git am Documentation/git-rebase.txt | 5 + builtin/am.c

Re: [PATCHv3] rebase: pass --[no-]signoff option to git am

2017-04-15 Thread Giuseppe Bilotta
On Sat, Apr 15, 2017 at 11:17 AM, Junio C Hamano wrote: > Giuseppe Bilotta writes: > >> This makes it easy to sign off a whole patchset before submission. >> >> To make things work, we also fix a design issue in git-am that made it >> ignore the signoff opti

[PATCHv3] rebase: pass --[no-]signoff option to git am

2017-04-14 Thread Giuseppe Bilotta
moving the conditional addition of the signoff from parse_mail() to the caller (am_run()), after either of the parse_mail*() functions were called. Signed-off-by: Giuseppe Bilotta --- Documentation/git-rebase.txt | 5 + builtin/am.c | 6 +++--- git-rebase.sh| 3

Re: [PATCHv2] rebase: pass --[no]-signoff option to git am

2017-04-14 Thread Giuseppe Bilotta
On Sat, Apr 15, 2017 at 12:44 AM, Ævar Arnfjörð Bjarmason wrote: > On Fri, Apr 14, 2017 at 6:50 PM, Giuseppe Bilotta > wrote: > > It should be --[no-]signoff, not --[no]-signoff, since the latter > implies that ---signoff works, see my 2c7ee986c7 where I fixed some > existing

[PATCHv2] rebase: pass --[no]-signoff option to git am

2017-04-14 Thread Giuseppe Bilotta
moving the conditional addition of the signoff from parse_mail() to the caller (am_run()), after either of the parse_mail*() functions were called. Signed-off-by: Giuseppe Bilotta --- Documentation/git-rebase.txt | 5 + builtin/am.c | 6 +++--- git-rebase.sh| 3

Re: [PATCH] rebase: pass --signoff option to git am

2017-01-26 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 9:03 PM, Giuseppe Bilotta wrote: > On Mon, Jan 23, 2017 at 7:13 PM, Junio C Hamano wrote: >> >> Should we plan to extend this to the interactive backend that is >> shared between rebase -i and rebase -m, too? Or is this patch >> alrea

Re: [PATCH] rebase: pass --signoff option to git am

2017-01-23 Thread Giuseppe Bilotta
On Tue, Jan 24, 2017 at 12:27 AM, Junio C Hamano wrote: > Giuseppe Bilotta writes: >> >> I'm not sure I follow. If the user doesn't want to signoff during a >> rebase, they can simply not pass --signoff. If they do, they can not >> pass it. Am I missing somet

[PATCH 5/5] sequencer: allow to --skip current commit

2017-01-23 Thread Giuseppe Bilotta
If a sequencing gets interrupted (by a conflict or an empty commit or whatever), the user can now opt to just skip it passing the `--skip` command line option, which acts like a `--continue`, except that the current commit gets skipped. Signed-off-by: Giuseppe Bilotta --- Documentation

[PATCH 4/5] cherry-pick: allow skipping only redundant commits

2017-01-23 Thread Giuseppe Bilotta
This allows the preservation of originally empty commits with the combination of flags --allow-empty --skip-redundant-commits. Signed-off-by: Giuseppe Bilotta --- Documentation/git-cherry-pick.txt | 8 - builtin/revert.c | 18 +++- sequencer.c

[PATCH 2/5] sequencer: save/load all options

2017-01-23 Thread Giuseppe Bilotta
Add the missing replay_opts to save_opts and populate_opts, so that an interrupted cherry-pick will continue with the same setup it had before the interruption. Signed-off-by: Giuseppe Bilotta --- sequencer.c | 16 1 file changed, 16 insertions(+) diff --git a/sequencer.c b

[PATCH 1/5] sequencer: sort options load/save by struct position

2017-01-23 Thread Giuseppe Bilotta
No functional change. The order in which options are serialized and reloaded is now the same in which they appear in the replay_opts structure. This makes it easier to spot when we forget to serialize/reload an option value. Signed-off-by: Giuseppe Bilotta --- sequencer.c | 24

[PATCH 0/5] sequencer: allow skipping commits

2017-01-23 Thread Giuseppe Bilotta
example because a better version of the commit was already merged). Giuseppe Bilotta (5): sequencer: sort options load/save by struct position sequencer: save/load all options cherry-pick: option to skip empty commits cherry-pick: allow skipping only redundant commits sequencer: allow to

[PATCH 3/5] cherry-pick: option to skip empty commits

2017-01-23 Thread Giuseppe Bilotta
This allows cherry-picking a set of commits, some of which may be redundant, without stopping to ask for the user intervention. Signed-off-by: Giuseppe Bilotta --- Documentation/git-cherry-pick.txt | 4 builtin/revert.c | 1 + sequencer.c | 45

Re: [PATCH] rebase: pass --signoff option to git am

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 9:16 PM, Junio C Hamano wrote: > Giuseppe Bilotta writes: > >> On Mon, Jan 23, 2017 at 7:13 PM, Junio C Hamano wrote: >>> >>> Should we plan to extend this to the interactive backend that is >>> shared between rebase -i and rebase

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 9:10 PM, Junio C Hamano wrote: > Giuseppe Bilotta writes: > >> ... I still don't see how to force a complete reread of the index >> after running a git reset (which I need for the --skip command), ... > > Do you mean discard_index() o

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 7:15 PM, Junio C Hamano wrote: > Giuseppe Bilotta writes: > >> By the way, I noticed going over the code that the -allow options are >> not stored, so that in case of interruption they will be reset, is >> this intentional or a bug? > > I

Re: [PATCH] rebase: pass --signoff option to git am

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 7:13 PM, Junio C Hamano wrote: > > Should we plan to extend this to the interactive backend that is > shared between rebase -i and rebase -m, too? Or is this patch > already sufficient to cover them? AFAIK this is sufficient for both, in the sense that I've used it with g

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 12:27 AM, Junio C Hamano wrote: > Giuseppe Bilotta writes: >> +static int allow_or_skip_empty(struct replay_opts *opts, struct commit >> *commit) >> { >> int index_unchanged, empty_commit; >> >> /* >>

[RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-21 Thread Giuseppe Bilotta
This allows cherry-picking a set of commits, some of which may be redundant, without stopping to ask for the user intervention. Signed-off-by: Giuseppe Bilotta --- Documentation/git-cherry-pick.txt | 4 builtin/revert.c | 1 + sequencer.c | 45

[PATCH] rebase: pass --signoff option to git am

2017-01-21 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta --- Documentation/git-rebase.txt | 5 + git-rebase.sh| 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 67d48e6883..e6f0b93337 100644 --- a/Documentation/git

Re: [PATCH 0/2] gitk spacing/sizing tuning for HiDPI

2015-12-07 Thread Giuseppe Bilotta
On Mon, Dec 7, 2015 at 5:09 AM, Eric Sunshine wrote: > > Both patches are missing your Signed-off-by:. Doh sorry, resending now. -- Giuseppe "Oblomov" Bilotta -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo

[PATCH 1/2] gitk: match ttk fonts to gitk fonts

2015-12-07 Thread Giuseppe Bilotta
ntset to the one used by gitk internally. Signed-off-by: Giuseppe Bilotta --- gitk | 18 ++ 1 file changed, 18 insertions(+) diff --git a/gitk b/gitk index fcc606e..e04264b 100755 --- a/gitk +++ b/gitk @@ -1943,6 +1943,8 @@ proc confirm_popup {msg {owner .}} { } proc setop

[PATCH 2/2] gitk: let .bleft.mid widgets 'breathe'

2015-12-07 Thread Giuseppe Bilotta
The widgets on top of the diff window are very tightly packed. Make them breathe a little by adding an 'i'-spaced padding between them. Signed-off-by: Giuseppe Bilotta --- gitk | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index e04264b..b621

[PATCH 2/2] gitk: let .bleft.mid widgets 'breathe'

2015-12-06 Thread Giuseppe Bilotta
The widgets on top of the diff window are very tightly packed. Make them breathe a little by adding an 'i'-spaced padding between them. --- gitk | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index e04264b..b621762 100755 --- a/gitk +++ b/gitk @@ -2361,6 +2

[PATCH 1/2] gitk: match ttk fonts to gitk fonts

2015-12-06 Thread Giuseppe Bilotta
The fonts set in setoptions aren't consistently picked up by ttk, who uses its own predefined fonts. This is noticeable when switching between using and not using ttk with custom fonts or in HiDPI settings (where the default TTK fonts do _not_ respect tk sclaing). Fix by mapping the ttk fontset to

[PATCH 0/2] gitk spacing/sizing tuning for HiDPI

2015-12-06 Thread Giuseppe Bilotta
spacing between the checkboxes on top of the diff window are a little too tightly-spaced; the second patch adds a little bit of breathing space. Giuseppe Bilotta (2): gitk: match ttk fonts to gitk fonts gitk: let .bleft.mid widgets 'breathe' gitk | 26

Re: git rebase -i failing due to phantom index.lock

2015-09-21 Thread Giuseppe Bilotta
Hello, On Thu, Sep 17, 2015 at 2:57 PM, Duy Nguyen wrote: > On Thu, Sep 17, 2015 at 3:08 AM, Giuseppe Bilotta > wrote: > >> A somewhat problematic git bisect has allowed me to identify commit >> 03b86647722f11ccc321cd7279aa49b811d17cc2 as the first bad commit. >

git rebase -i failing due to phantom index.lock

2015-09-16 Thread Giuseppe Bilotta
Hello all, I've recently started to note an issue with git rebase -i failing with alarming frequency, especially on one of my repositories, claiming that index.lock could not be created because it exists, even though it doesn't and nothing else seems to be locking the index. The rebase bombs more

[PATCH] apply: comment grammar fix

2015-09-09 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 54aba4e..4aa53f7 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -785,7 +785,7 @@ static int guess_p_value(const char *nameline

[PATCH] gitk: accelerators for the main menu

2015-09-09 Thread Giuseppe Bilotta
This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a new view). Signed-off-by: Giuseppe Bilotta --- gitk | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gitk b/gitk index 51520ef..4fc6267 100755 --- a

Re: [PATCH] git_connect: clear GIT_* environment for ssh

2015-09-05 Thread Giuseppe Bilotta
es through all > environment variables; this isn't normal, but does simulate > one possible setup). > > Signed-off-by: Jeff King The patch works for me, so aside from the suggested commit message change, I'm all for it. Reviewed-by: Giuseppe Bilotta > --- > connect.c

Re: [RFC] a tale of Git 2.5, ssh transport and GIT_* environment variables

2015-09-04 Thread Giuseppe Bilotta
On Fri, Sep 4, 2015 at 8:18 PM, Junio C Hamano wrote: > Jeff King writes: > >> It shouldn't be necessary for $GIT_DIR, but it makes sense for other git >> variables. E.g., with "AcceptEnv GIT_*", "git -c" config is propagated. >> E.g.: >> ... > > Just to make sure I got you correctly, you are say

Re: [RFC] a tale of Git 2.5, ssh transport and GIT_* environment variables

2015-09-04 Thread Giuseppe Bilotta
Hello, On Fri, Sep 4, 2015 at 2:54 PM, Jeff King wrote: > On Fri, Sep 04, 2015 at 12:52:45PM +0200, Giuseppe Bilotta wrote: > >> Notice two things: the messages refer to the worktree updir of the >> CLIENT machine, and even though it's _completely not obvious_ due to

[RFC] a tale of Git 2.5, ssh transport and GIT_* environment variables

2015-09-04 Thread Giuseppe Bilotta
Hello all, I'm going to tell a tale of the oddest bug I've ever come across in Git and aks for suggestions on how we can improve the user experience in a sensible way. I've been stymied for days trying to solve the following issue, which I came across every time I tried to push to a specific mac

[PATCH 2/2] gitweb: expose tags feed in appropriate places

2012-09-25 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta --- gitweb/gitweb.perl | 47 +-- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 6cb51f7..9ac28aa 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl

[PATCH 1/2] gitweb: infrastructure for tags feed

2012-09-25 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta --- gitweb/gitweb.perl | 79 +++--- 1 file changed, 58 insertions(+), 21 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7f8c187..6cb51f7 100755 --- a/gitweb/gitweb.perl +++ b/gitweb

[RFC PATCH 0/2] gitweb: tags feed

2012-09-25 Thread Giuseppe Bilotta
;s a draft implementation, comments welcome. Giuseppe Bilotta (2): gitweb: infrastructure for tags feed gitweb: expose tags feed in appropriate places gitweb/gitweb.perl | 126 ++--- 1 file changed, 91 insertions(+), 35 deletions(-) -- 1.7.12.1.577.gff96

Re: [PATCH] gitweb: Add support for gravatar-ssl

2012-08-09 Thread Giuseppe Bilotta
Chris West (Faux) wrote: > Teach gitweb to allow 'avatar' to be set to 'gravatar-ssl', switching > to the https://secure.gravatar.com url form, to avoid mixed content > warnings when serving gitweb over https, with gravatar enabled. > --- > I'd alternatively propose always using the https:// form