From list at eworm.de  Mon Apr  4 19:18:53 2022
From: list at eworm.de (Christian Hesse)
Date: Mon,  4 Apr 2022 21:18:53 +0200
Subject: [PATCH 1/1] RFC: git: update to v2.36.0-rc0
Message-ID: <20220404191853.33337-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.36.0-rc0, this requires changes for these
upstream commits:

* 95433eeed9eac439eb21eb30105354b15e71302e
  diff: add ability to insert additional headers for paths

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 4 ++--
 git      | 2 +-
 ui-log.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 2d9198d..0452919 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.35.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.36.0.rc0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index 4c53a8c..faa21c1 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a
+Subproject commit faa21c10d44184f616d391c158dcbb13b9c72ef3
diff --git a/ui-log.c b/ui-log.c
index 20774bf..565929f 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
 		      "", &revs->diffopt);
 	diffcore_std(&revs->diffopt);
 
-	found = !diff_queue_is_empty();
+	found = !diff_queue_is_empty(&revs->diffopt);
 	saved_fmt = revs->diffopt.output_format;
 	revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
 	revs->diffopt.format_callback = cgit_diff_tree_cb;
-- 
2.35.1


From kilian.felder at nextstride.com  Thu Apr  7 14:57:11 2022
From: kilian.felder at nextstride.com (Kilian Felder)
Date: Thu, 7 Apr 2022 14:57:11 +0000
Subject: Tag-Info on the Web-GUI (cgit)
In-Reply-To: <ZR0P278MB0617FD5402C8B4C687D31E4195E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>
References: <ZR0P278MB0617FD5402C8B4C687D31E4195E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>
Message-ID: <ZR0P278MB061739AC8A571A02C1CE7C5A95E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>

Hi folks,

As you can see on the attached pics.. For my tags I get the header <Download> (but I do not have an archive to download) and the commit-link.
This may be ok when the tags are not annotated, but my tags are and I expected to see this annotation info at this place.

Instead I have to click on the tag to see my annotation <Release 2022.03 ...> (cgit02.png).

I checked your code but I do not understand how this works and I'm not able to implement this behavior for me. This is then a feature request to modify your code accordingly. Maybe add an additional column with this annotation info (only the first line), or you make it configurable over the cgitrc file to select what info should be displayed.

Thanks in advance and best regards,
Kilian

-------------- next part --------------
A non-text attachment was scrubbed...
Name: cgit01.png
Type: image/png
Size: 34743 bytes
Desc: cgit01.png
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20220407/3dbe1589/attachment.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cgit02.png
Type: image/png
Size: 7864 bytes
Desc: cgit02.png
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20220407/3dbe1589/attachment-0001.png>

From list at eworm.de  Thu Apr  7 15:17:07 2022
From: list at eworm.de (Christian Hesse)
Date: Thu, 7 Apr 2022 17:17:07 +0200
Subject: Tag-Info on the Web-GUI (cgit)
In-Reply-To: <ZR0P278MB061739AC8A571A02C1CE7C5A95E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>
References: <ZR0P278MB0617FD5402C8B4C687D31E4195E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>
 <ZR0P278MB061739AC8A571A02C1CE7C5A95E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>
Message-ID: <20220407171707.1019d1b2@leda.eworm.net>

Kilian Felder <kilian.felder at nextstride.com> on Thu, 2022/04/07 14:57:
> Hi folks,
> 
> As you can see on the attached pics.. For my tags I get the header
> <Download> (but I do not have an archive to download) and the commit-link.
> This may be ok when the tags are not annotated, but my tags are and I
> expected to see this annotation info at this place.
> 
> Instead I have to click on the tag to see my annotation <Release 2022.03
> ...> (cgit02.png).
> 
> I checked your code but I do not understand how this works and I'm not able
> to implement this behavior for me. This is then a feature request to modify
> your code accordingly. Maybe add an additional column with this annotation
> info (only the first line), or you make it configurable over the cgitrc
> file to select what info should be displayed.

Usually you find the archive download links there, looks like you did not
enable any snapshot archive formats. Have a look at `snapshots=` in cgitrc.

It looks like this with `snapshots=tar.gz tar.zst`:

https://git.eworm.de/cgit/pacredir/
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20220407/cebeb139/attachment.sig>

From kilian.felder at nextstride.com  Thu Apr  7 16:29:53 2022
From: kilian.felder at nextstride.com (Kilian Felder)
Date: Thu, 7 Apr 2022 16:29:53 +0000
Subject: AW: Tag-Info on the Web-GUI (cgit)
In-Reply-To: <20220407171707.1019d1b2@leda.eworm.net>
References: <ZR0P278MB0617FD5402C8B4C687D31E4195E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>
 <ZR0P278MB061739AC8A571A02C1CE7C5A95E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>
 <20220407171707.1019d1b2@leda.eworm.net>
Message-ID: <ZR0P278MB06171A33C4AFC9B522975F7295E69@ZR0P278MB0617.CHEP278.PROD.OUTLOOK.COM>

Hi Christian,

This does not solve my problem. I don't have snapshots to download (hence snapshots=none).
At this point I want to see my tag annotation (e.g. gitweb does this). I can't configure that.

Das l?st mein Problem nicht. Ich habe keine Snapshots zum Downloaden (daher snapshots=none).
An dieser Stelle m?chte ich meine Tag-Annotation sehen (z.B. gitweb macht das). Das kann ich nicht konfigurieren.

Regards, Kilian


-----Urspr?ngliche Nachricht-----
Von: Christian Hesse <list at eworm.de> 
Gesendet: Donnerstag, 7. April 2022 17:17
An: Kilian Felder <kilian.felder at nextstride.com>
Cc: cgit at lists.zx2c4.com
Betreff: Re: Tag-Info on the Web-GUI (cgit)

Kilian Felder <kilian.felder at nextstride.com> on Thu, 2022/04/07 14:57:
> Hi folks,
> 
> As you can see on the attached pics.. For my tags I get the header 
> <Download> (but I do not have an archive to download) and the commit-link.
> This may be ok when the tags are not annotated, but my tags are and I 
> expected to see this annotation info at this place.
> 
> Instead I have to click on the tag to see my annotation <Release 
> 2022.03 ...> (cgit02.png).
> 
> I checked your code but I do not understand how this works and I'm not 
> able to implement this behavior for me. This is then a feature request 
> to modify your code accordingly. Maybe add an additional column with 
> this annotation info (only the first line), or you make it 
> configurable over the cgitrc file to select what info should be displayed.

Usually you find the archive download links there, looks like you did not enable any snapshot archive formats. Have a look at `snapshots=` in cgitrc.

It looks like this with `snapshots=tar.gz tar.zst`:

https://git.eworm.de/cgit/pacredir/
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}

From list at eworm.de  Tue Apr 12 17:13:03 2022
From: list at eworm.de (Christian Hesse)
Date: Tue, 12 Apr 2022 19:13:03 +0200
Subject: [PATCH 1/1] git: update to v2.35.2
Message-ID: <20220412171303.23841-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.35.2, no additional changes required.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2d9198d..e9c4e39 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.35.1
+GIT_VER = 2.35.2
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index 4c53a8c..53ef17d 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a
+Subproject commit 53ef17d3ee0f7fcb151f428ee3bd736b8046825f
-- 
2.35.2


From list at eworm.de  Tue Apr 12 17:17:01 2022
From: list at eworm.de (Christian Hesse)
Date: Tue, 12 Apr 2022 19:17:01 +0200
Subject: [PATCH 1/1] RFC: git: update to v2.36.0-rc2
Message-ID: <20220412171701.36387-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.36.0-rc2, this requires changes for these
upstream commits:

* 95433eeed9eac439eb21eb30105354b15e71302e
  diff: add ability to insert additional headers for paths

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 4 ++--
 git      | 2 +-
 ui-log.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e9c4e39..0ac049e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.35.2
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.36.0.rc2
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index 53ef17d..11cfe55 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 53ef17d3ee0f7fcb151f428ee3bd736b8046825f
+Subproject commit 11cfe552610386954886543f5de87dcc49ad5735
diff --git a/ui-log.c b/ui-log.c
index 20774bf..565929f 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
 		      "", &revs->diffopt);
 	diffcore_std(&revs->diffopt);
 
-	found = !diff_queue_is_empty();
+	found = !diff_queue_is_empty(&revs->diffopt);
 	saved_fmt = revs->diffopt.output_format;
 	revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
 	revs->diffopt.format_callback = cgit_diff_tree_cb;
-- 
2.35.2


From marius.kriegerowski at gmail.com  Sat Apr 16 08:00:17 2022
From: marius.kriegerowski at gmail.com (Marius Kriegerowski)
Date: Sat, 16 Apr 2022 10:00:17 +0200
Subject: Show 404 when switching branches when file was moved
Message-ID: <0874AB9A-2717-4D9A-AD51-B4B1D71952A5@gmail.com>

Hi,

This is a follow-up from this thread [REMOVED AFTER I RECEIVED A REPLY THAT THIS MESSAGE WAS BLOCKED BECAUSE OF HTML?]

When looking at a file that was moved on another branch, switching to that branch still displays that file in its original state. Example:

[REMOVED AFTER I RECEIVED A REPLY THAT THIS MESSAGE WAS BLOCKED BECAUSE OF HTML?]

Switching in the top right corner to dunfell should make clear that this file did not exist under that name on the target branch (dunfel). E.g. GitHub is showing simply a 404 which I think is reasonable.

For comparison, the same file on the GitHub clone: [REMOVED AFTER I RECEIVED A REPLY THAT THIS MESSAGE WAS BLOCKED BECAUSE OF HTML?]

The current behaviour is misleading regarding what is actually there.

Best regards

Marius


From marius.kriegerowski at gmail.com  Sat Apr 16 08:03:38 2022
From: marius.kriegerowski at gmail.com (Marius Kriegerowski)
Date: Sat, 16 Apr 2022 10:03:38 +0200
Subject: Show 404 when switching branches when file was moved
In-Reply-To: <0874AB9A-2717-4D9A-AD51-B4B1D71952A5@gmail.com>
References: <0874AB9A-2717-4D9A-AD51-B4B1D71952A5@gmail.com>
Message-ID: <019FDD28-2AC6-46FE-BBB7-43407DFA1F5F@gmail.com>

Follow-up. Seems like the email was accepted without http links. I?m using OSX mail / gmail. Not sure how I can get the links to you. Anyways, I hope the issue became clear.

> On 16. Apr 2022, at 10:00, Marius Kriegerowski <marius.kriegerowski at gmail.com> wrote:
> 
> Hi,
> 
> This is a follow-up from this thread [REMOVED AFTER I RECEIVED A REPLY THAT THIS MESSAGE WAS BLOCKED BECAUSE OF HTML?]
> 
> When looking at a file that was moved on another branch, switching to that branch still displays that file in its original state. Example:
> 
> [REMOVED AFTER I RECEIVED A REPLY THAT THIS MESSAGE WAS BLOCKED BECAUSE OF HTML?]
> 
> Switching in the top right corner to dunfell should make clear that this file did not exist under that name on the target branch (dunfel). E.g. GitHub is showing simply a 404 which I think is reasonable.
> 
> For comparison, the same file on the GitHub clone: [REMOVED AFTER I RECEIVED A REPLY THAT THIS MESSAGE WAS BLOCKED BECAUSE OF HTML?]
> 
> The current behaviour is misleading regarding what is actually there.
> 
> Best regards
> 
> Marius
> 


From list at eworm.de  Mon Apr 18 20:17:39 2022
From: list at eworm.de (Christian Hesse)
Date: Mon, 18 Apr 2022 22:17:39 +0200
Subject: [PATCH 1/1] git: update to v2.36.0
Message-ID: <20220418201739.35439-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.36.0, this requires changes for these
upstream commits:

* 95433eeed9eac439eb21eb30105354b15e71302e
  diff: add ability to insert additional headers for paths

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 ui-log.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index de72176..2509d21 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.35.3
+GIT_VER = 2.36.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index d516b2d..6cd33dc 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d516b2db0af2221bd6b13e7347abdcb5830b2829
+Subproject commit 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e
diff --git a/ui-log.c b/ui-log.c
index 20774bf..565929f 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
 		      "", &revs->diffopt);
 	diffcore_std(&revs->diffopt);
 
-	found = !diff_queue_is_empty();
+	found = !diff_queue_is_empty(&revs->diffopt);
 	saved_fmt = revs->diffopt.output_format;
 	revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
 	revs->diffopt.format_callback = cgit_diff_tree_cb;
-- 
2.36.0