gitk: Fix bug causing undefined variable error when cherry-picking