Re: Transition plan for git to move to a new hash function

Ian Jackson wrote: A few questions and one or two suggestions... > TEXTUAL SYNTAX > == > > We also reserve the following syntax for private experiments: > E[A-Z]+[0-9a-z]+ > We declare that public releases of git will never accept such > object names. Instead of this I would sugge

Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)

Jakub Narębski wrote: > > Food for thought Yes, very helpful, thanks. I got mobbed by other things today so I won't be able to get back to this until next week. Tony (off for a few days holiday). -- f.anthony.n.finchhttp://dotat.at/ Lundy, Fastnet, Irish Sea, Shannon: West or southwest, vee

Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)

Jakub Narębski wrote: > > A question about implementation: why emptying $path_info in > evaluate_path_info()? That was for consistency with other parts of the subroutine which (mostly) remove items from the global $path_info variable when they are added to %input_params. But since $path_info isn'

Re: What's cooking in git.git (Jul 2015, #01; Wed, 1)

Jakub Narębski wrote: > Thanks for the review! > > * tf/gitweb-project-listing (2015-03-19) 5 commits > > - gitweb: make category headings into links when they are directories > > - gitweb: optionally set project category from its pathname > > - gitweb: add a link under the search box to clea

Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)

What can I do to help un-stall my gitweb patches? > [Stalled] > > * tf/gitweb-project-listing (2015-03-19) 5 commits > - gitweb: make category headings into links when they are directories > - gitweb: optionally set project category from its pathname > - gitweb: add a link under the search box

Re: [PATCH] gitweb: Update logo and favicon

Thomas Schneider wrote: > The new images were downloaded from > https://git-scm.herokuapp.com/downloads/logos > and converted with ImageMagick: > convert -resize 72x30 Git-Logo-2Color.eps git-logo.png > convert -resize 16x16 Git-Icon-1788C.eps git-favicon.png > The old logo was only 27 pixel

[PATCH] gitweb: avoid double / in search form action link

ntial URL, and failed to correctly follow PATH_INFO escaping rules. This change makes the form action URL consistent with the URL generated by href(). Signed-off-by: Tony Finch --- gitweb/gitweb.perl | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/g

Re: How to send a warning message from git hosting server?

Yi, EungJun wrote: > > I want a way to response a remote message when a client send any kind > of request. Is it possible? Yes, though you need a wrapper around git. Recent versions of gitolite have a "motd" message of the day feature. http://gitolite.com/gitolite/list-non-core.html#triggers To

Re: [PATCH 5/5] gitweb: make category headings into links when they are directories

> On 26 Mar 2015, at 19:49, Junio C Hamano wrote: > > Any comments from those who use or have their own code in Gitweb on > this topic? Thanks for chasing up my patches. I should have written a covering letter, to say that you can see these patches in action at https://git.csx.cam.ac.uk/x/ucs

[PATCH 1/5] gitweb: fix typo in man page

Signed-off-by: Tony Finch --- Documentation/gitweb.conf.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index ebe7a6c..29f1e06 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt

[PATCH 5/5] gitweb: make category headings into links when they are directories

When $projects_list_category_is_directory is turned on, project categories can be useful as project filters, so with that setting gitweb now makes the category headings into project_filter links (like the breadcrumbs). Signed-off-by: Tony Finch --- gitweb/gitweb.perl | 14 -- 1 file

[PATCH 2/5] gitweb: if the PATH_INFO is incomplete, use it as a project_filter

https://www.example.org/projects/git/ you would get a list of all projects, same as the top URL. As well as fixing that omission, this change also makes gitweb generate PATH_INFO-style URLs for project filter links, such as in the breadcrumbs. Signed-off-by: Tony Finch --- gitweb/gitweb.perl

[PATCH 3/5] gitweb: add a link under the search box to clear a project filter

search and keeps the project filter. Signed-off-by: Tony Finch --- gitweb/gitweb.perl | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 073f324..9abc5bc 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5549,10

[PATCH 4/5] gitweb: optionally set project category from its pathname

When repositories are organized in a hierarchial directory tree it is convenient if gitweb project categories can be set automatically based on their parent directory, so that users do not have to set the same information twice. Signed-off-by: Tony Finch --- Documentation/gitweb.conf.txt | 6

[PATCH] git-prompt: preserve value of $? in all cases

Signed-off-by: Tony Finch --- contrib/completion/git-prompt.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 3c3fc6d..3e70e74 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib

Re: [PATCH v2] git-prompt: preserve value of $? inside shell prompt

SZEDER Gábor wrote: > > Makes sense, but the patch doesn't cover all cases, because > __git_ps1() can exit early Thanks for looking at the patch. I feel quite silly for missing the other return points :-( Follow-up patch on the way... Tony. -- f.anthony.n.finchhttp://dotat.at/ Faeroes, Sout

Re: [PATCH v2] git-prompt: preserve value of $? inside shell prompt

Junio C Hamano wrote: > > Yes. I wouldn't have spent 20 minutes experimenting with various > hypothetical use cases if the above were there in the first place. Sorry for wasting your time, and thanks for reviewing the patch. (I am so used to having $? in my prompt it took me ages to find and ex

[PATCH v2] git-prompt: preserve value of $? inside shell prompt

makes the workaround unnecessary. Signed-off-by: Tony Finch --- contrib/completion/git-prompt.sh | 4 1 file changed, 4 insertions(+) I hope that explains it properly :-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index c5473dc..5fe69d0 100644 --- a/co

[PATCH] git-prompt: preserve command exit status

Signed-off-by: Tony Finch --- contrib/completion/git-prompt.sh | 4 1 file changed, 4 insertions(+) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index c5473dc..5fe69d0 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh

Uplift from SCCS to Git

I have just completed a project to convert an old and scruffy SCCS working tree to Git. This conversion involved a fair amount of toolsmithing. I have published my conversion scripts at https://git.csx.cam.ac.uk/x/ucs/ipreg/sccs2rcs2cvs2git.git And there is a report on the conversion process at h

Re: "Branch objects" (was: Re: cherry picking and merge)

Nico Williams wrote: > On Thu, Aug 07, 2014 at 05:42:34PM +0100, Tony Finch wrote: > > > > The problem is that the production branch gets copied around: pushed to > > the repo server, pulled by other team members, etc. Forced pushes > > are accident-prone, as is resetti

Re: "Branch objects" (was: Re: cherry picking and merge)

Nico Williams wrote: > On Thu, Aug 07, 2014 at 12:38:48PM +0100, Tony Finch wrote: > > > But [a rebasing workflow] is inconvenient for deploying the patched > > version to production (which is the point of developing the fixes) - I > > want a fast-forwarding branch for

Re: "Branch objects" (was: Re: cherry picking and merge)

Nico Williams wrote: > On Wed, Aug 06, 2014 at 08:31:18PM +0200, Jakub Narębski wrote: > > On Wed, Aug 6, 2014 at 6:26 PM, Nico Williams wrote: > > > > > > My proposal was to put this sort of ancillary history info in a > > > "branch object" (and that branches should be objects). > > > > Is it so

[PATCH v3 2/2] imap-send: create target mailbox if it is missing

e from the server when an APPEND target is missing. However this code never ran (the create and trycreate flags were never set) and when I tried to make it run I found that the code had already thrown away the contents of the message it was trying to append. Signed-off-by: Tony Finch --- imap-s

[PATCH v3 1/2] imap-send: clarify CRAM-MD5 vs LOGIN documentation

Explicitly mention that leaving imap.authMethod unset makes git imap-send use the basic IMAP plaintext LOGIN command. Signed-off-by: Tony Finch --- Documentation/git-imap-send.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-imap-send.txt b

Re: [PATCH 2/2] imap-send: create target mailbox if it is missing

Junio C Hamano wrote: > > The basic idea looks good, but I have doubts on one point. Thanks for spotting the mistake in the error handling. I'll send an update with a fix. Tony. -- f.anthony.n.finchhttp://dotat.at/ South Utsire: Southwesterly 4 or 5, occasionally 6 at first in south, backin

[PATCH] git-push: fix link in man page

Signed-off-by: Tony Finch --- Documentation/git-push.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 21cd455..c0d7403 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -33,7 +33,7

[PATCH 5/5] gitweb: make category headings into links when they are directories

When $projects_list_category_is_directory is turned on, project categories can be useful as project filters, so with that setting gitweb now makes the category headings into project_filter links (like the breadcrumbs). Signed-off-by: Tony Finch --- gitweb/gitweb.perl | 14 -- 1 file

[PATCH 2/5] gitweb: if the PATH_INFO is incomplete, use it as a project_filter

https://www.example.org/projects/git/ you would get a list of all projects, same as the top URL. As well as fixing that omission, this change also makes gitweb generate PATH_INFO-style URLs for project filter links, such as in the breadcrumbs. Signed-off-by: Tony Finch --- gitweb/gitweb.perl

[PATCH 3/5] gitweb: add a link under the search box to clear a project filter

search and keeps the project filter. Signed-off-by: Tony Finch --- gitweb/gitweb.perl | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 12aba8f..d1e6b79 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5545,10

[PATCH 4/5] gitweb: optionally set project category from its pathname

When repositories are organized in a hierarchial directory tree it is convenient if gitweb project categories can be set automatically based on their parent directory, so that users do not have to set the same information twice. Signed-off-by: Tony Finch --- Documentation/gitweb.conf.txt | 6

[PATCH 0/5] gitweb: improve directory hierarchy handling

There are two main things in this little seris: The second and third patches improve gitweb's project filter feature, which is for listing just the projects in a subdirectory. The fourth and fifth allow the admin to use a directory hierarchy to automatically categorize projects in gitweb.

[PATCH 1/5] gitweb: fix typo in man page

Signed-off-by: Tony Finch --- Documentation/gitweb.conf.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index ebe7a6c..29f1e06 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt

[PATCH 2/2] imap-send: create target mailbox if it is missing

e from the server when an APPEND target is missing. However this code never ran (the create and trycreate flags were never set) and when I tried to make it run I found that the code had already thrown away the contents of the message it was trying to append. Signed-off-by: Tony Finch --- imap-s

[PATCH 1/2] imap-send: clarify CRAM-MD5 vs LOGIN documentation

Explicitly mention that leaving imap.authMethod unset makes git imap-send use the basic IMAP plaintext LOGIN command. Signed-off-by: Tony Finch --- Documentation/git-imap-send.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-imap-send.txt b

Re: [PATCH] imap-send: clarify CRAM-MD5 vs LOGIN documentation

Junio C Hamano wrote: > > Both patches make sense to me, but can you please sign-off your > patches? Oops, sorry about that. Re-roll on its way... Tony. -- f.anthony.n.finchhttp://dotat.at/ Thames, Dover: Southwest 4 or 5, increasing 6 at times. Slight or moderate. Fair. Good. -- To unsubsc

[PATCH] imap-send: clarify CRAM-MD5 vs LOGIN documentation

Explicitly mention that leaving imap.authMethod unset makes git imap-send use the basic IMAP plaintext LOGIN command. --- Documentation/git-imap-send.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 87

[PATCH] imap-send: clarify CRAM-MD5 vs LOGIN documentation

Explicitly mention that leaving imap.authMethod unset makes git imap-send use the basic IMAP plaintext LOGIN command. --- Documentation/git-imap-send.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 87

[PATCH] imap-send: create target mailbox if it is missing

Some MUAs delete their "drafts" folder when it is empty, so git imap-send should be able to create it if necessary. This change checks that the folder exists immediately after login and tries to create it if it is missing. There was some vestigial code to handle a [TRYCREATE] response from the se

Re: [PATCH] gitweb: Avoid overflowing page body frame with large images

Andrew Keller wrote: > > With that said, I don't think it's unreasonable for a software project > to contain images larger than a browser window. And, when that happens, > I'm pretty confident that the default behavior should be to scale the > image down so the user can see the whole thing. Righ

Re: A workflow for local patch maintenance

Jeff King wrote: > > Do you need to keep the modifications you make on top of upstream as a > nice, clean series of rebased patches? If not, then you can avoid the > repeated rebasing, and just use a more traditional topic-branch > workflow. Treat modifications from upstream as just another topic.

A workflow for local patch maintenance

This is a copy of an article I published at http://fanf.livejournal.com/128282.html I'm sending a copy here because I'm interested to know what other ways there might be of handling this situation. -- We often need to patch the software that we run in order to fix bugs quickly rather than wait fo

Re: [PATCH v4 2/4] gitweb: vertically centre contents of page footer

Junio C Hamano wrote: > Tony Finch writes: > > > div.page_footer { > > - height: 17px; > > + height: 22px; > > padding: 4px 8px; > > background-color: #d9d8d1; > > } > > > > div.page_footer_text { > > + line-height: 22p

[PATCH v4 4/4] gitweb: make search help link less ugly

The search help link was a superscript question mark right next to a drop-down menu, which looks misaligned and is a cramped and awkward click target. Remove the superscript tags and add some spacing to fix these nits. Add a title attribute to provide an explanatory mouseover. Signed-off-by: Tony

[PATCH v4 2/4] gitweb: vertically centre contents of page footer

Signed-off-by: Tony Finch --- gitweb/static/gitweb.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css index a869be1..3b4d833 100644 --- a/gitweb/static/gitweb.css +++ b/gitweb/static/gitweb.css @@ -68,12 +68,13

[PATCH v4 0/4] Four small gitweb tweaks

This is mostly just a repost to un-stall this topic. I have fixed the tab damage problem spotted by Jakub in the search help link patch, and I have improved the commit message for the repository owner patch. No other changes. Tony Finch (4): gitweb: Ensure OPML text fits inside its box

[PATCH v4 3/4] gitweb: omit the repository owner when it is unset

On the repository summary page, leave the owner line out if the repo does not have an owner, rather than displaying a labelled empty field. This does not affect the owner column in the projects list page, which is present unless $omit_owner is true. Signed-off-by: Tony Finch --- gitweb

[PATCH v4 1/4] gitweb: Ensure OPML text fits inside its box.

The rss_logo CSS style has a fixed width which is too narrow for the string "OPML". Replace the fixed width with horizontal padding so the text fits with nice margins. Signed-off-by: Tony Finch --- gitweb/static/gitweb.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) di

Re: git-http-backend vs gitweb pathinfo mode

Tony Finch wrote: > > For example, go to https://git.csx.cam.ac.uk/i/ucs/git/git.git/tree > and click on the gitweb subdirectory which takes you to > https://git.csx.cam.ac.uk/i/ucs/git/git.git/tree/HEAD:/gitweb > then click on [git/git.git] to go back, which takes

git-http-backend vs gitweb pathinfo mode

Background: You cam make the same URL work for gitwe and git clone as described in git-http-backend(1). It says: To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs that git http-backend can handle, and forward the rest to gitweb: ScriptAliasMatch \

Re: [PATCH 3/4] gitweb: omit the repository owner when it is unset

Jakub Narębski wrote: > On Tue, Jul 2, 2013 at 6:24 PM, Tony Finch wrote: > > > On the repository summary page, leave the whole owner line out if > > the repo does not have an owner, rather than displaying a labelled > > empty field.. > > Note that if $omit_ow

Re: [PATCH 4/4] gitweb: make search help link less ugly

Jakub Narębski wrote: > > - -values => ['commit', 'grep', 'author', > > 'committer', 'pickaxe']) . > > + -values => ['commit', 'grep', 'author', > > 'committer', 'pickaxe']) . > > Nb. what changed here (in line above)? Whoops, tab damag

[PATCH 2/4] gitweb: vertically centre contents of page footer

Signed-off-by: Tony Finch --- gitweb/static/gitweb.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css index a869be1..3b4d833 100644 --- a/gitweb/static/gitweb.css +++ b/gitweb/static/gitweb.css @@ -68,12 +68,13

[PATCH 4/4] gitweb: make search help link less ugly

The search help link was a superscript question mark right next to a drop-down menu, which looks misaligned and is a cramped and awkward click target. Remove the superscript tags and add some spacing to fix these nits. Add a title attribute to provide an explanatory mouseover. Signed-off-by: Tony

[PATCH 3/4] gitweb: omit the repository owner when it is unset

On the repository summary page, leave the whole owner line out if the repo does not have an owner, rather than displaying a labelled empty field.. Signed-off-by: Tony Finch --- gitweb/gitweb.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb

[PATCH 1/4] gitweb: Ensure OPML text fits inside its box.

The rss_logo CSS style has a fixed width which is too narrow for the string "OPML". Replace the fixed width with horizontal padding so the text fits with nice margins. Signed-off-by: Tony Finch --- gitweb/static/gitweb.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) di

Re: [PATCH] gitweb: Ensure OPML text fits inside its box.

Jonathan Nieder wrote: > > Sounds sensible. Can we have your sign-off? (Likewise for the next > patch.) Doh! Thanks for looking at the patches. I'll post revised versions, plus a couple more tweaks. Tony. -- f.anthony.n.finchhttp://dotat.at/ Forties, Cromarty: East, veering southeast, 4 o

[PATCH] gitweb: vertically centre contents of page footer

--- gitweb/static/gitweb.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css index a869be1..3b4d833 100644 --- a/gitweb/static/gitweb.css +++ b/gitweb/static/gitweb.css @@ -68,12 +68,13 @@ div.page_path { } div.page_foot

[PATCH] gitweb: Ensure OPML text fits inside its box.

The rss_logo CSS style has a fixed width which is too narrow for the string "OPML". Replace the fixed width with horizontal padding so the text fits with nice margins. --- For before/after examples, see http://dotat.at/cgi/git (overflow) and https://git.csx.cam.ac.uk/x/ucs/ (padded). gitweb/stat

[PATCH v3] gitweb: allow extra breadcrumbs to prefix the trail

There are often parent pages logically above the gitweb projects list, e.g. home pages of the organization and department that host the gitweb server. This change allows you to include links to those pages in gitweb's breadcrumb trail. Signed-off-by: Tony Finch Reviewed-by: Jonathan N

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

Jakub Narębski wrote: > > In what situation do you need those extra breadcrumbs useful? What > necessity / itch to scratch is behind idea of this patch? For an example, see https://git.csx.cam.ac.uk/x/ucs/git/git.git I have three items in @extra_breadcrumbs which point to the University home pag

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

Jakub Narębski wrote: > > First, do I understand corrctly that @extra_breadcrumbs are rendered *after* > $home_link*, and in exactly the same manner? Before the home link, and yes, in the same manner. The extra breadcrumbs are for links to parent pages above gitweb in some hierarchy. > But now I

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

Jakub Narębski wrote: > > It would be better to improve documentation, than follow current bad > practice... ;-P The v2 patch does just that :-) > Perhaps even make ( [ $home_link_str, $home_link ] ) to be default > value for @extra_breadcrumbs, making new feature generalization > of $home_link*

[PATCH v2] gitweb: allow extra breadcrumbs to prefix the trail

There are often parent pages logically above the gitweb projects list, e.g. home pages of the organization and department that host the gitweb server. This change allows you to include links to those pages in gitweb's breadcrumb trail. Signed-off-by: Tony Finch Reviewed-by: Jonathan N

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

Jakub Narębski wrote: > On Wed, Jul 3, 2013 at 11:59 PM, Jonathan Nieder wrote: > > Tony Finch wrote: > > >> +@extra_breadcrumbs:: > >> + Additional links to be added to the start of the breadcrumb trail, > >> + that are logically "

[PATCH] gitweb: allow extra breadcrumbs to prefix the trail

There are often parent pages logically above the gitweb projects list, e.g. home pages of the organization and department that host the gitweb server. This change allows you to include links to those pages in gitweb's breadcrumb trail. Signed-off-by: Tony Finch --- Documentation/gitweb.con