author | Paul Mackerras <paulus@samba.org> | |
Tue, 18 Nov 2008 08:54:14 +0000 (19:54 +1100) | ||
committer | Paul Mackerras <paulus@samba.org> | |
Tue, 18 Nov 2008 08:54:14 +0000 (19:54 +1100) | ||
commit | cdc8429c94e43181ac0bd48225c2af85499d2f5a | |
tree | 8967d1fd9f95a6033f55476f39cca3ecdde95e14 | tree | snapshot |
parent | 2958228430b63f2e38c55519d1f98d8d6d9e23f3 | commit | diff |
gitk: Show local changes properly when we have a path limit
Since gitk looks for the HEAD commit to attach the fake commits for
local changes to, we can miss out on seeing the fake commits if we
have a path limit and the HEAD commit doesn't alter any of the files
in the path limit.
This fixes it by running
git rev-list -1 $head -- $paths
if we have a path limit, and taking the result of that as the commit
to attach the fake commits to. This means that we can be attaching
the fake commits to a different commit in each view, so we use a new
$viewmainhead($view) for that.
This also fixes a buglet where updatecommits would only fix up the
fake commits if the HEAD changed since the last call to updatecommits,
whereas it should fix them up if the HEAD has changed since this view
was last created or updated.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Since gitk looks for the HEAD commit to attach the fake commits for
local changes to, we can miss out on seeing the fake commits if we
have a path limit and the HEAD commit doesn't alter any of the files
in the path limit.
This fixes it by running
git rev-list -1 $head -- $paths
if we have a path limit, and taking the result of that as the commit
to attach the fake commits to. This means that we can be attaching
the fake commits to a different commit in each view, so we use a new
$viewmainhead($view) for that.
This also fixes a buglet where updatecommits would only fix up the
fake commits if the HEAD changed since the last call to updatecommits,
whereas it should fix them up if the HEAD has changed since this view
was last created or updated.
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk | diff | blob | history |