summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-p4.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 5b79920..c0a3068 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3325,7 +3325,9 @@ class P4Sync(Command, P4UserMap):
if currentChange < change:
earliestCommit = "^%s" % next
else:
- latestCommit = "%s" % next
+ if next == latestCommit:
+ die("Infinite loop while looking in ref %s for change %s. Check your branch mappings" % (ref, change))
+ latestCommit = "%s^@" % next
return ""