| commit | 75bc9573b0e332c34bc1c3d97306077fda573083 | |
| author | Tor Arvid Lund <torarvid@gmail.com> | |
| Tue, 9 Dec 2008 15:41:50 +0000 (9 16:41 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Dec 2008 05:39:16 +0000 (9 21:39 -0800) | ||
| tree | ca973e1ce04def7f07a0e3da8c1f97d7d84cb60c | treesnapshot (tar.gz zip) |
| parent | 29b802aae6213d02879d21aabac1a8d2e035b583 | commitdiff |
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>
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>
| contrib/fast-import/git-p4 | diffblobblamehistory |