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
1
third_party/git/t/t9810-git-p4-rcs.sh
vendored
1
third_party/git/t/t9810-git-p4-rcs.sh
vendored
|
|
@ -294,7 +294,6 @@ test_expect_success 'cope with rcs keyword file deletion' '
|
|||
echo "\$Revision\$" >kwdelfile.c &&
|
||||
p4 add -t ktext kwdelfile.c &&
|
||||
p4 submit -d "Add file to be deleted" &&
|
||||
cat kwdelfile.c &&
|
||||
grep 1 kwdelfile.c
|
||||
) &&
|
||||
git p4 clone --dest="$git" //depot &&
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue