summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2012-01-11 18:31:08 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-11 16:35:38 -0800
commit6ee9a9993fcbe5dae356013c51cfed1e39eeaf01 (patch)
tree409c391376725fa25a9eb6b310ddb4fe3424fbd5 /contrib/fast-import
parentgit-p4: fix verbose comment typo (diff)
downloadtgif-6ee9a9993fcbe5dae356013c51cfed1e39eeaf01.tar.xz
git-p4: clarify comment
Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p43
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e267f3115d..e11e15bad0 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1363,7 +1363,8 @@ class View(object):
else:
# This mapping matched; no need to search any further.
# But, the mapping could be rejected if the client path
- # has already been claimed by an earlier mapping.
+ # has already been claimed by an earlier mapping (i.e.
+ # one later in the list, which we are walking backwards).
already_mapped_in_client = False
for f in paths_filled:
# this is View.Path.match