After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 780401 - parents shown incorrectly
parents shown incorrectly
Status: RESOLVED DUPLICATE of bug 619211
Product: gitg
Classification: Applications
Component: gitg
3.22.x
Other Mac OS
: Normal normal
: ---
Assigned To: gitg-maint
gitg-maint
Depends on:
Blocks:
 
 
Reported: 2017-03-22 14:21 UTC by Alex Băluț
Modified: 2017-09-30 20:31 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
incorrect display of some parents (34.05 KB, image/png)
2017-03-22 14:21 UTC, Alex Băluț
Details

Description Alex Băluț 2017-03-22 14:21:02 UTC
Created attachment 348492 [details]
incorrect display of some parents

Run the script below to create a repository and check how it's displayed. Notice the following problems in the attached screenshot:
- the parent of b1 should be x, but it appears with no parent
- the 2nd parent of the two merge-master-in-b commits point to nowhere, where they should point to m1 (blue) and m2 (red)

#!/bin/bash
rm -rf /tmp/x1
mkdir /tmp/x1
cd /tmp/x1
git init
echo "1" > x; git add x; git commit -m "x"

git checkout -b b
echo "1" > b1; git add b1; git commit -m "b1"

git checkout master
echo "1" > m1; git add m1; git commit -m "m1"

git checkout b
git merge master -m merge-master-in-b
echo "1" > b2; git add b2; git commit -m "b2"

git checkout master
echo "1" > m2; git add m2; git commit -m "m2"

git checkout b
git merge master -m merge-master-in-b
echo "1" > b3; git add b3; git commit -m "b3"

git checkout master
echo "1" > m3; git add m3; git commit -m "m3"
git merge b -m merge-master-in-b
Comment 1 Alexandre Franke 2017-09-30 20:31:40 UTC

*** This bug has been marked as a duplicate of bug 619211 ***