opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bk/p4-prepare-p4-only-fix' 

The "--prepare-p4-only" option is supposed to stop after replaying
one changeset, but kept going (by mistake?)

* bk/p4-prepare-p4-only-fix:
  git-p4.py: fix --prepare-p4-only error with multiple commits
This commit is contained in:
Junio C Hamano 2020-06-02 13:35:01 -07:00
parent 0739479c6a 2dfdd705ff
commit 7a8fec908a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-p4.py
View File

@ -2537,11 +2537,12 @@ class P4Submit(Command, P4UserMap):
ok = self.applyCommit(commit)
if ok:
applied.append(commit)
else:
if self.prepare_p4_only and i < last:
print("Processing only the first commit due to option" \
" --prepare-p4-only")
if self.prepare_p4_only:
if i < last:
print("Processing only the first commit due to option" \
" --prepare-p4-only")
break
else:
if i < last:
# prompt for what to do, or use the option/variable
if self.conflict_behavior == "ask":