mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass the right number of arguments to commit, fixes single-branch imports.

Browse Source 
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
Simon Hausmann
2007-03-19 12:04:37 +01:00
parent 09e16455e0
commit 95d27cb75d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/fast-import/p4-fast-export.py
View File

@ -330,7 +330,7 @@ def commit(details, files, branch, branchPrefix, parent, merged = ""):
action = file["action"] action = file["action"]
if file["type"] == "apple": if file["type"] == "apple":
print "\nfile %s is a strange apple file that forks. Ignoring!" %s path print "\nfile %s is a strange apple file that forks. Ignoring!" % path
continue continue
if action == "delete": if action == "delete":
@ -608,7 +608,7 @@ else:
merged = "refs/heads/" + merged merged = "refs/heads/" + merged
commit(description, files, branch, branchPrefix, parent, merged) commit(description, files, branch, branchPrefix, parent, merged)
else: else:
commit(description, filesForCommit, branch, globalPrefix, initialParent) commit(description, files, branch, globalPrefix, initialParent)
initialParent = "" initialParent = ""
except IOError: except IOError:
print gitError.read() print gitError.read()