summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Paul Mackerras <paulus@samba.org>2007-08-29 22:41:34 +1000
committerLibravatar Paul Mackerras <paulus@samba.org>2007-08-29 22:41:34 +1000
commit719c2b9d926bf2be4879015e3620d27d32f007b6 (patch)
treee764eff873f0791587db4543cefb8c54420dbc82 /git-merge.sh
parentgitk: Add a window to list branches, tags and other references (diff)
downloadtgif-719c2b9d926bf2be4879015e3620d27d32f007b6.tar.xz
gitk: Fix bug causing undefined variable error when cherry-picking
When "Show nearby tags" is turned off and the user did a cherry-pick, we were trying to access variables relating to the descendent/ancestor tag & head computations in addnewchild though they hadn't been set. This makes sure we don't do that. Reported by Johannes Sixt. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions