undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ld/p4-unshelve-fix'

Browse Source 
The "unshelve" subcommand of "git p4" used incorrectly used
commit^N where it meant to say commit~N to name the Nth generation
ancestor, which has been corrected.

* ld/p4-unshelve-fix:
  git-p4: use HEAD~$n to find parent commit for unshelve
  git-p4 unshelve: adding a commit breaks git-p4 unshelve
This commit is contained in:
Junio C Hamano 2020-09-25 15:25:40 -07:00
commit 9f4588d72b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@ -4237,7 +4237,7 @@ class P4Unshelve(Command):
""" """
for parent in (range(65535)): for parent in (range(65535)):
log = extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent)) log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
settings = extractSettingsGitLog(log) settings = extractSettingsGitLog(log)
if 'change' in settings: if 'change' in settings:
return settings return settings

5
t/t9832-unshelve.sh
View File

@ -29,8 +29,11 @@ test_expect_success 'init depot' '
) )
' '
# Create an initial clone, with a commit unrelated to the P4 change
# on HEAD
test_expect_success 'initial clone' ' test_expect_success 'initial clone' '
git p4 clone --dest="$git" //depot/@all git p4 clone --dest="$git" //depot/@all &&
test_commit -C "$git" "unrelated"
' '
test_expect_success 'create shelved changelist' ' test_expect_success 'create shelved changelist' '