merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
2
third_party/git/t/t5528-push-default.sh
vendored
2
third_party/git/t/t5528-push-default.sh
vendored
|
|
@ -163,7 +163,7 @@ test_pushdefault_workflow success current master
|
|||
# update parent1's foo (which is our upstream)
|
||||
test_pushdefault_workflow success upstream foo
|
||||
|
||||
# upsream is foo which is not the name of the current branch
|
||||
# upstream is foo which is not the name of the current branch
|
||||
test_pushdefault_workflow failure simple master
|
||||
|
||||
# master and foo are updated
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue