]> git.ipfire.org Git - thirdparty/git.git/commit - gitk-git/gitk
gitk: Don't filter view arguments through git rev-parse
authorPaul Mackerras <paulus@samba.org>
Sun, 2 Mar 2008 23:19:35 +0000 (10:19 +1100)
committerPaul Mackerras <paulus@samba.org>
Sun, 2 Mar 2008 23:19:35 +0000 (10:19 +1100)
commit468bcaedbb1589f16955e63b6bfba01c2f53e433
treec29b69d99a63d0c9a47d9e8c1d0efa3fea14b3c6
parentac1276ab6eaae8e10e409263370dca21b8772359
gitk: Don't filter view arguments through git rev-parse

Previously we passed the arguments indicating what commits the user
wants to view through git rev-parse to get a list of IDs (positive and
negative), then gave that to git log.  This had a couple of problems,
notably that --merge and --left-right didn't get handled properly.

Instead we now just pass the original arguments to git log.  When doing
an update, we append --not followed by the list of commits we have seen
that have no children, since we have got (or will get) their ancestors
from the first git log.  If the first git log isn't finished yet, we
might get some duplicates from the second git log, but that doesn't
cause any problem.

Also get rid of the unused vnextroot variable.

Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk