tig-2.0.3 has been release with this fix: https://github.com/jonas/tig/commit/adb362bd657cc474629557310dfab12051bb61ac
On Tue, Aug 12, 2014 at 9:57 PM, Jonas Fonseca <jonas.fons...@gmail.com> wrote: > A temporary work-around is to add the following to your ~/.tigrc: > > set commit-order = topo > > to enable the work-around for all repositories or alternatively add > the following line on a repository basis in the .git/config file > > [tig] commit-order = topo > > The problem is that the default commit order breaks the graph renderer > when child commits are emitted before parent commits. > > I believe this bug corresponds to bug #238: > > - https://github.com/jonas/tig/issues/238 > > > On Sun, Aug 10, 2014 at 9:32 PM, Jonas Fonseca <jonas.fons...@gmail.com> > wrote: >> Hi Simon, >> >> This is indeed a regression. The graph rendering was reworked extensively in >> version 2.0 to fix several other bugs. I'll investigate if a fix can be made >> for tig version 2.0.3 and keep you informed. >> >> On Aug 10, 2014 11:09 AM, "Simon Paillard" <spaill...@debian.org> wrote: >>> >>> Package: tig >>> Version: 2.0.2-1 >>> Severity: normal >>> >>> Dear Maintainer, >>> >>> The way tig displays branches/merges on with a standard debian >>> git workflow was way better in 1.2.1-1 than in 2.0.2-1. >>> >>> This makes the display rather difficult to read. >>> >>> Indeed, tig 2.0.2-1 adds one more column for each merge performed (in my >>> case), >>> compared to the method git log uses. >>> >>> Example, using >>> >>> http://anonscm.debian.org/gitweb/?p=users/spaillard/pkg-manpages.git;a=summary >>> >>> You'll find the display of : >>> * tig 2.0.2-1 >>> * cgit >>> * git log --graph >>> * tig 1.2.1-1 >>> >>> The display with 2.0.2-1 is (tig >>> 59db9a89c24e66407a8147542adf7cfe6477d914^1..debian/3.65): >>> 2014-05-07 14:00 o │ {origin/master} {origin/HEAD} <debian/3.65-1> Release >>> 3.65-1 >>> 2014-04-27 23:52 o │ fallocate.2: ffix >>> 2014-05-04 23:44 o │ d/control: Take over locale.1 from libc-bin (See >>> #556173) >>> 2014-05-04 23:37 o │ inet_net_pton.3: new manpage in 3.65 >>> 2014-05-04 23:33 M─│─┐ Merge tag 'upstream/3.65' >>> 2014-05-04 23:33 │ o─┘ <upstream/3.65> Imported Upstream version 3.65 >>> 2014-05-04 23:33 o │ d/changelog: prepare 3.64-1 >>> 2014-04-16 22:04 │ o {origin/upstream} <upstream/3.64> Imported Upstream >>> version 3.64 >>> 2014-04-16 22:04 M─│─┐ Merge tag 'upstream/3.64' >>> 2014-03-01 16:51 o │ │ <debian/3.61-1> Prepare 3.61-1 >>> 2014-02-27 00:41 M─│─│─┐ Merge tag 'upstream/3.61' >>> 2014-02-27 00:41 │ o─│─┘ <upstream/3.61> Imported Upstream version 3.61 >>> 2014-02-15 00:49 o │ │ <debian/3.58-1> Release 3.58-1 >>> 2014-02-15 12:10 M─│─│─┐ Merge tag 'upstream/3.58' >>> 2014-02-12 00:33 o │ │ │ debian/upstream/signing-key.asc: Michael Kerrisk >>> key 0x3A35CE5E >>> 2014-02-12 00:25 │ o─│─┘ <upstream/3.58> Imported Upstream version 3.58 >>> 2014-02-03 22:04 o │ │ <debian/3.57-1> Bump Standards-Version to 3.9.5 >>> 2014-02-03 21:53 o │ │ Prepare 3.57-1 >>> 2014-01-25 13:56 │ o │ <upstream/3.57> Imported Upstream version 3.57 >>> 2014-01-25 13:56 M─│─│─┐ Merge tag 'upstream/3.57' >>> 2014-01-17 23:16 o │ │ │ <debian/3.56-1> Release 3.56-1 >>> 2014-01-12 18:15 o │ │ │ d/changelog: Upstream 3.56-1 closes #729570 >>> #723659 #732464, adds vdso.7 >>> 2014-01-12 18:06 │ o │ │ <upstream/3.56> Imported Upstream version 3.56 >>> 2014-01-12 18:06 M─│─│─│─┐ Merge tag 'upstream/3.56' >>> >>> While cgit (using "git log --graph" I guess): >>> http://anonscm.debian.org/cgit/collab-maint/manpages.git/log/ >>> >>> While "git log --graph=full" is: >>> * | 7db5c611af03d97c2e4b77f302f7af61a5b14594 Release 3.65-1 >>> * | 71bb94a26fc410fdab877b7bc9fb65d8731afe6c fallocate.2: ffix >>> * | 06ca065fffd2ff9068777091f7447f9d82e81154 d/control: Take over locale.1 >>> from libc-bin (See #556173) >>> * | a7d39a5f23eb6c7ccb1f0c9de9a03556aade2d3c inet_net_pton.3: new manpage >>> in 3.65 >>> * | 657bd4dac3ae8b6efb5a0c7b60abc81072212cfa Merge tag 'upstream/3.65' >>> |\ \ >>> | |/ >>> | * 85a28d8549604ec6f8a8223c0b19ae3d27578760 Imported Upstream version >>> 3.65 >>> * | 9e063ece1fd5ff74013a3862bd63b9c05e5f3675 d/changelog: prepare 3.64-1 >>> * | 004aa0a839f88b1bdf7e0259da39b9b1baf09b8d Merge tag 'upstream/3.64' >>> |\ \ >>> | |/ >>> | * c58c390bb42b34326d63fea9272387202499d6cc Imported Upstream version >>> 3.64 >>> * | ce42701e90f61eb67b75f80c24bcd07f1269fdec Prepare 3.61-1 >>> * | 6f05769ad06ecaf1ae04e665b5f4116b14836ee6 Merge tag 'upstream/3.61' >>> |\ \ >>> | |/ >>> | * 671892fbce58d89882dfefdb6d089546db6a9ac2 Imported Upstream version >>> 3.61 >>> * | 3404ce35c536f3a326a1d975cb3b0aacd42658ed Release 3.58-1 >>> * | 007fba22f0a5eb9f38ed7c3627d0987258b7f100 Merge tag 'upstream/3.58' >>> |\ \ >>> | |/ >>> | * b2aabd86f554d93155b5a7d2516faa04014991b3 Imported Upstream version >>> 3.58 >>> * | ff5577ae4fd6197739d54b5eb0ca62d029df21f5 >>> debian/upstream/signing-key.asc: Michael Kerrisk key 0x3A35CE5E >>> * | 2e733029ebe9b5bb756a58dd3eb1b2a43cc7f32c Bump Standards-Version to >>> 3.9.5 >>> * | 7257fecb8b3ef8749d36d16d1a19bd05910477ea Prepare 3.57-1 >>> * | d06dc88a7efd435d155334184947068f10b5e6ea Merge tag 'upstream/3.57' >>> |\ \ >>> | |/ >>> | * ab7c1502630e81e4c0780e6bf0aa1b0bc28a695b Imported Upstream version >>> 3.57 >>> * | 0be394f1307e3187589d9a9b002ae5c6f55bd200 Release 3.56-1 >>> * | 4bcdf095a617c0a8208051bf25c8fdb73b7899eb d/changelog: Upstream 3.56-1 >>> closes #729570 #723659 #732464, adds vdso.7 >>> * | 59db9a89c24e66407a8147542adf7cfe6477d914 Merge tag 'upstream/3.56' >>> >>> The display with 1.2.1-1 is (tig >>> 59db9a89c24e66407a8147542adf7cfe6477d914^1..debian/3.65): >>> 2014-05-07 14:00 o [debian/3.65-1] [origin/HEAD] [origin/master] Release >>> 3.65-1 >>> 2014-04-27 23:52 o fallocate.2: ffix >>> 2014-05-04 23:44 o d/control: Take over locale.1 from libc-bin (See >>> #556173) >>> 2014-05-04 23:37 o inet_net_pton.3: new manpage in 3.65 >>> 2014-05-04 23:33 M─┐ Merge tag 'upstream/3.65' >>> 2014-05-04 23:33 │ o [upstream/3.65] Imported Upstream version 3.65 >>> 2014-05-04 23:33 o │ d/changelog: prepare 3.64-1 >>> 2014-04-16 22:04 │ o [upstream/3.64] [origin/upstream] Imported Upstream >>> version 3.64 >>> 2014-04-16 22:04 M─┐ Merge tag 'upstream/3.64' >>> 2014-03-01 16:51 o │ [debian/3.61-1] Prepare 3.61-1 >>> 2014-02-27 00:41 M─┐ Merge tag 'upstream/3.61' >>> 2014-02-27 00:41 │ o [upstream/3.61] Imported Upstream version 3.61 >>> 2014-02-15 00:49 o │ [debian/3.58-1] Release 3.58-1 >>> 2014-02-15 12:10 M─┤ Merge tag 'upstream/3.58' >>> 2014-02-12 00:33 o │ debian/upstream/signing-key.asc: Michael Kerrisk key >>> 0x3A35CE5E >>> 2014-02-12 00:25 │ o [upstream/3.58] Imported Upstream version 3.58 >>> 2014-02-03 22:04 o │ [debian/3.57-1] Bump Standards-Version to 3.9.5 >>> 2014-02-03 21:53 o │ Prepare 3.57-1 >>> 2014-01-25 13:56 │ o [upstream/3.57] Imported Upstream version 3.57 >>> 2014-01-25 13:56 M─┐ Merge tag 'upstream/3.57' >>> 2014-01-17 23:16 o │ [debian/3.56-1] Release 3.56-1 >>> 2014-01-12 18:15 o │ d/changelog: Upstream 3.56-1 closes #729570 #723659 >>> #732464, adds vdso.7 >>> 2014-01-12 18:06 │ │ o [upstream/3.56] Imported Upstream version 3.56 >>> 2014-01-12 18:06 M─┐ │ Merge tag 'upstream/3.56' >>> >>> >>> >>> >>> -- System Information: >>> Debian Release: jessie/sid >>> APT prefers testing >>> APT policy: (500, 'testing') >>> Architecture: amd64 (x86_64) >>> Foreign Architectures: i386 >>> >>> Kernel: Linux 3.14-2-amd64 (SMP w/4 CPU cores) >>> Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) >>> Shell: /bin/sh linked to /bin/dash >>> >>> Versions of packages tig depends on: >>> ii git [git-core] 1:2.0.1-1 >>> ii git-core 1:2.0.1-1 >>> ii libc6 2.19-7 >>> ii libncursesw5 5.9+20140712-2 >>> ii libreadline6 6.3-6 >>> ii libtinfo5 5.9+20140712-2 >>> >>> tig recommends no packages. >>> >>> tig suggests no packages. >>> >>> -- no debconf information >>> >> > > > > -- > Jonas Fonseca -- Jonas Fonseca -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
