author | Paul Mackerras <paulus@samba.org> | |
Tue, 21 Apr 2009 12:22:31 +0000 (22:22 +1000) | ||
committer | Paul Mackerras <paulus@samba.org> | |
Tue, 21 Apr 2009 12:22:31 +0000 (22:22 +1000) | ||
commit | 6f63fc18b6197f9a582fbfe23a5c7938fe593951 | |
tree | e5525dd7e9d86189e7b70b7f0db79de479d76620 | tree | snapshot |
parent | 478afad697e58433f34d69b5fe08511405f23506 | commit | diff |
gitk: Fix compare-commits function when we have local changes
This fixes a bug in the compare-commits function added in commit
010509f2 ("gitk: Add a command to compare two strings of commits")
where gitk would show an error dialog if the comparison of commits
got to a fake commit (one showing local changes). It extends
getpatchid to handle these fake commits by using [diffcmd] to get
the git diff command variant to use, and also handles the situation
where an error occurs.
Now that we can have the fake commit IDs showing up, which are
00..00 and 00..01, the short ID is ambiguous. To make sure the links
point to the right commit, this adds a new [appendshortlink] procedure
which takes the full link destination, and uses that rather than
appendwithlinks.
Signed-off-by: Paul Mackerras <paulus@samba.org>
This fixes a bug in the compare-commits function added in commit
010509f2 ("gitk: Add a command to compare two strings of commits")
where gitk would show an error dialog if the comparison of commits
got to a fake commit (one showing local changes). It extends
getpatchid to handle these fake commits by using [diffcmd] to get
the git diff command variant to use, and also handles the situation
where an error occurs.
Now that we can have the fake commit IDs showing up, which are
00..00 and 00..01, the short ID is ambiguous. To make sure the links
point to the right commit, this adds a new [appendshortlink] procedure
which takes the full link destination, and uses that rather than
appendwithlinks.
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk | diff | blob | history |