summaryrefslogtreecommitdiff
path: root/thread-utils.c
diff options
context:
space:
mode:
authorLibravatar Tor Arvid Lund <torarvid@gmail.com>2008-12-09 16:41:50 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-09 21:39:16 -0800
commit75bc9573b0e332c34bc1c3d97306077fda573083 (patch)
treeca973e1ce04def7f07a0e3da8c1f97d7d84cb60c /thread-utils.c
parentImprove language in git-merge.txt and related docs (diff)
downloadtgif-75bc9573b0e332c34bc1c3d97306077fda573083.tar.xz
git-p4: Fix regression in p4Where method.
Unfortunately, I introduced a bug in commit 7f705dc36 (git-p4: Fix bug in p4Where method). This happens because sometimes the result from "p4 where <somepath>" doesn't contain a "depotFile" key, but instead a "data" key that needs further parsing. This commit should ensure that both of these cases are checked. Signed-off-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'thread-utils.c')
0 files changed, 0 insertions, 0 deletions