mainSavannah Administration - Support: sr #110813, CGIT web interface does not...

 
 

sr #110813: CGIT web interface does not display individual merged commits

Submitter:  Ihor Radchenko <yantar92>
Submitted:  Tue 17 Jan 2023 11:37:21 AM UTC
   
 
Category:  Source code repositories - web browsing Priority:  5 - Normal
Severity:  2 - Minor Status:  Done
Privacy:  Public Assigned to:  None
Operating System:  None Open/Closed:  Closed
* Mandatory Fields

Add a New Comment Rich Markup
   

Wed 18 Jan 2023 06:14:12 AM UTC, comment #2: 

The response came through the mailing list.

https://lists.gnu.org/archive/html/savannah-hackers/2023-01/msg00008.html

> So, the merged commits did get listed, but according to their original
> commit dates, right?
>
> That kind of makes sense. Although a bit awkward at the same time.
>
> Thanks for the clarification!
>
> I thus do not see anything that should be done on savannah side. Feel
> free to close.


In case there is a cgit issue let me know that we are simply running
the stock Trisquel packaged version of cgit.  It should behave just
like the stock upstream version of cgit.  Currently it is version cgit
1.1 in Trisquel 9 but soon we will be upgrading to cgit 1.2.3 in
Trisquel 11.  We are happy to customize and to patch but we really are
not cgit developers here but are simply cgit consumers.

Bob Proulx <rwp>
Site Administrator
Tue 17 Jan 2023 12:17:12 PM UTC, comment #1: 

I can see the one parent, 07c63df9, next to the reported commit, 4f319088; the other parent, 9ed28210, shows up for me on the next page, git.savannah.gnu.org/cgit/emacs/org-mode.git/log/?ofs=50

Ineiev <ineiev>
Site Administrator
Tue 17 Jan 2023 11:37:21 AM UTC, original submission:  

Hi,

We recently had a merge commit from a local branch in Org mode repo (https://git.savannah.gnu.org/cgit/emacs/org-mode.git/log/). The merge commit itself was displayed in the web /log interface, but all the individual merged commits where omitted [1], which was not expected.

To illustrate what I am referring to, check out https://git.savannah.gnu.org/cgit/emacs/org-mode.git/log/ and search for Merge branch 'ob-shell-cleanup-tests'. Unlike other instances of merge (for 'bugfix'), the containing merged commits are not listed in the log. (also see the attached screenshot).

Notably, the commits within the merge are available (see parent in https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=4f319088ba5f11d4b6adf808f39f11dfa52c08e4).

Is it something to deal with savannah configuration of cgit? Or maybe a cgit bug?

[1] https://list.orgmode.org/tpugj2$6ed$1@ciao.gmane.io/T/#m1a03bd6ddc4b24bcf25fd4b710bf3873040978ef

Ihor Radchenko <yantar92>

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:
   
   
Comment:
   

Attached Files
file #54240:  2023-01-17_14-33.png added by yantar92 (381KiB - image/png)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by rwp (Posted a comment)
  • -email is unavailable- added by ineiev (Posted a comment)
  • -email is unavailable- added by yantar92 (Submitted the item)
  •  

    There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

    Only logged-in users can vote.

     

    Follow 3 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2023-01-18 rwp StatusNone Done
        Open/ClosedOpen Closed
    2023-01-17 yantar92 Attached File- Added 2023-01-17_14-33.png, #54240

    Back to the top

    Powered by Savane 3.13-bb6a.
    Corresponding source code