summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2012-11-23 17:35:36 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-26 11:00:34 -0800
commit78189bead3f5fde22ae651d66208a0e0a375a819 (patch)
tree127cfe1cb8c2997710be0676446773c2c33c1325 /git-merge-resolve.sh
parentgit p4: handle servers without move support (diff)
downloadtgif-78189bead3f5fde22ae651d66208a0e0a375a819.tar.xz
git p4: catch p4 errors when streaming file contents
Error messages that arise during the "p4 print" phase of generating commits were silently ignored. Catch them, abort the fast-import, and exit. Without this fix, the sync/clone appears to work, but files that are inaccessible by the p4d server will still be imported to git, although without the proper contents. Instead the errant files will contain a p4 error message, such as "Librarian checkout //depot/path failed". Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions