merge: Handle not having common ancesstors #510
GitHub Actions / Unit Tests macOS-latest stable
failed
Aug 24, 2024 in 1s
134 passed, 32 failed and 2 skipped
❌ test-results.json
168 tests were completed in 138s with 134 passed, 32 failed and 2 skipped.
✅ test/async_repo_test.dart
✅ Basic
❌ test/blob_ctime_builder_test.dart
❌ Basic
FormatException: Filter error, bad data
✅ test/branch_test.dart
✅ Branch with a /
❌ test/commands/commit_test.dart
❌ Commit all Initial Repo Test - Single File
TimeoutException after 0:00:30.000000: Test timed out after 30 seconds. See https://pub.dev/packages/test#timeouts
✅ Sort directories
❌ test/commands/merge_delete_test.dart
❌ merge del2
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge del2, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_LtMEuJ/merge-delete_dart)
❌ test/commands/merge_test.dart
❌ merge fast-forward
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge fast-forward, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_Ew2ypi/merge_dart)
❌ merge up-to-date
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge up-to-date, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_Ew2ypi/merge_dart)
❌ merge merge-conflict -X ours
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge merge-conflict -X ours, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_Ew2ypi/merge_dart)
❌ test/commands/reset_test.dart
❌ reset --hard HEAD^
Expected: <0>
Actual: <1>
Dart command `reset --hard HEAD^` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_9PFVgL/merge_dart
❌ test/commands/single_commands_test.dart
✅ branch
✅ branch test
✅ branch -a
❌ write-tree
Expected: <0>
Actual: <1>
Dart command `write-tree` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
✅ rm LICENSE
❌ diff-tree 938c320fd826711ab4e3f5db5cf2f4557ff75522
Expected: <0>
Actual: <1>
Dart command `diff-tree 938c320fd826711ab4e3f5db5cf2f4557ff75522` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
❌ diff-tree 6216f82ecd10cac78c2b90ddcc4d0d9dc6f3d711
Expected: <0>
Actual: <1>
Dart command `diff-tree 6216f82ecd10cac78c2b90ddcc4d0d9dc6f3d711` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
✅ rm does-not-exist
✅ branch -d not-existing
✅ branch master
✅ rm /outside-rep
❌ checkout 1 file
Expected: <0>
Actual: <1>
Dart command `checkout LICENSE` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
✅ git rm deleted file
✅ git delete branch
✅ git upstream branch
✅ git remote
❌ git checkout remote branch
Expected: <0>
Actual: <1>
Dart command `checkout -b master origin/master` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
❌ git checkout branch
Expected: <0>
Actual: <1>
Dart command `checkout branch-for-ítesting` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
❌ reset --hard
Expected: <0>
Actual: <1>
Dart command `reset --hard HEAD^` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
❌ reset --hard
Expected: <0>
Actual: <1>
Dart command `reset --hard ef2118f9ed53fdc4c7c6104cbff7489612d76c0d` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
❌ checkout 1 file
Expected: <0>
Actual: <1>
Dart command `checkout LICENSE` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
✅ git rm deleted file
✅ git delete branch
✅ git upstream branch
✅ git remote
❌ git checkout remote branch
Expected: <0>
Actual: <1>
Dart command `checkout -b master origin/master` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
❌ git checkout branch
Expected: <0>
Actual: <1>
Dart command `checkout branch-for-ítesting` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
❌ test/commit_test.dart
❌ fixture mtime
FormatException: Filter error, bad data
❌ fixture merge
FormatException: Filter error, bad data
✅ test/config_test.dart
✅ Config Branches Test
✅ Config Serialization
✅ ConfigFile Serialization
✅ test/diff_commit_test.dart
✅ Duplicate Tree Object
❌ test/file_mtime_builder_test.dart
❌ Basic
FormatException: Filter error, bad data
✅ test/git_hash_test.dart
✅ Equality
✅ Zero Equality
✅ test/git_test.dart
✅ Test can Push
✅ test/git_url_parse_test.dart
all
✅ ssh://[email protected]:42/path/to/repo.git/
✅ git+ssh://[email protected]/path/name.git
✅ ssh://[email protected]/path/to/repo.git/
✅ ssh://host.xz:5497/path/to/repo.git/
✅ ssh://host.xz/path/to/repo.git/
✅ [email protected]:42foo/bar.git
✅ ssh://[email protected]/~user/path/to/repo.git/
✅ ssh://host.xz/~user/path/to/repo.git/
✅ ssh://[email protected]/~/path/to/repo.git
✅ ssh://host.xz/~/path/to/repo.git
✅ [email protected]:/path/to/repo.git/
✅ [email protected]:~user/path/to/repo.git/
✅ [email protected]:path/to/repo.git
✅ rsync://host.xz/path/to/repo.git/
✅ git://host.xz/path/to/repo.git/
✅ git://host.xz/~user/path/to/repo.git/
✅ http://host.xz/path/to/repo.git/
✅ https://host.xz/path/to/repo.git/
✅ https://token:[email protected]/path/to/repo.git/
✅ https://x-token-auth:[email protected]/path/to/repo.git/
✅ https://[email protected]/user/repo
✅ https://[email protected]/name.git
✅ https://token:[email protected]/owner/name.git
✅ https://x-token-auth:[email protected]/owner/name.git
✅ /path/to/repo.git/
✅ path/to/repo.git/
✅ ~/path/to/repo.git
✅ file:///path/to/repo.git/
✅ [email protected]:path/name.git
✅ test/idx_file_test.dart
✅ IdxFile Parser
✅ IdxFile Parser 64bit
✅ Idx file serialize
✅ Idx file 64 bit serialize
✅ test/index_test.dart
✅ Decode
✅ Decode Entries
✅ Decode Cache Tree Extension
✅ Serialize
✅ Decode Merge Conflict
✅ End of index entry
✅ Decode go-git-fixtures indexes
✅ decode v4
✅ test/is_ssh_url_test.dart
all
✅ ssh://[email protected]:port/path/to/repo.git/
✅ ssh://[email protected]/path/to/repo.git/
✅ ssh://host.xz:port/path/to/repo.git/
✅ ssh://host.xz/path/to/repo.git/
✅ ssh://[email protected]/~user/path/to/repo.git/
✅ ssh://host.xz/~user/path/to/repo.git/
✅ ssh://[email protected]/~/path/to/repo.git
✅ ssh://host.xz/~/path/to/repo.git
✅ [email protected]:/path/to/repo.git/
✅ [email protected]:~user/path/to/repo.git/
✅ [email protected]:path/to/repo.git
✅ host.xz:/path/to/repo.git/
✅ host.xz:path/to/repo.git
✅ host.xz:~user/path/to/repo.git/
✅ rsync://host.xz/path/to/repo.git/
✅ git://host.xz/path/to/repo.git/
✅ git://host.xz/~user/path/to/repo.git/
✅ http://host.xz/path/to/repo.git/
✅ https://host.xz/path/to/repo.git/
✅ /path/to/repo.git/
✅ path/to/repo.git/
✅ ~/path/to/repo.git
✅ file:///path/to/repo.git/
✅ file://~/path/to/repo.git/
✅ test/merge_base_test.dart
MergeBase
✅ NoAncestorsWhenNoCommonHistory
✅ CommonAncestorInMergedOrphans
✅ MergeBaseWithSelf
✅ MergeBaseWithAncestor
✅ DoubleCommonAncestorInCrossMerge
✅ DoubleCommonInSubFeatureBranches
Independents
✅ OnlyOne
✅ OnlyRepeated
✅ RepeatedAncestors
✅ BeyondShortcut
✅ BeyondShortcutBis
✅ PairOfAncestors
✅ AcrossCrossMerges
✅ ChangingOrderRepetition
✅ ChangingOrder
✅ ParentChild
Ancestor
✅ OnlyOne
✅ OnlyOneRev
✅ BeyondMerges
✅ BeyondMergesRev
✅ AncestorSame
✅ AncestorUnrelated
✅ AncestorUnrelatedRev
❌ test/packfile_test.dart
❌ Packfile
FormatException: Filter error, bad data
❌ Packfile with deltas
FormatException: Filter error, bad data
❌ Packfile with deltas 2
FormatException: Filter error, bad data
❌ Packfile with Ref Delta
FormatException: Filter error, bad data
❌ test/plumbing/commit_iterator_bfs_filtered_test.dart
❌ Basic
FormatException: Filter error, bad data
❌ Filter All But One
FormatException: Filter error, bad data
❌ Filter All
FormatException: Filter error, bad data
❌ isLimit
FormatException: Filter error, bad data
❌ isValid and isLimit
FormatException: Filter error, bad data
❌ test/plumbing/commit_iterator_test.dart
❌ BFS
FormatException: Filter error, bad data
❌ PreOrder
FormatException: Filter error, bad data
✅ test/plumbing/ignore_test.dart
✅ TestSimpleMatch_inclusion
✅ test/plumbing/objects/blob_test.dart
✅ Reads the blob file correctly
✅ test/plumbing/objects/commit_test.dart
✅ Git Commit
✅ Commit with GPG
✅ Author Parse
✅ Author Serialize
✅ Author Serialize negative
✅ test/plumbing/objects/kvlm_test.dart
✅ Parses KVLM Properly
✅ Parse test commit
✅ Parse empty
✅ test/plumbing/objects/tree_test.dart
✅ Reads the tree file correctly
✅ test/plumbing/pack_file_delta_test.dart
⚪ AddDelta
⚪ IncompleteDelta
✅ test/utils/date_time_test.dart
✅ timeZoneOffset
✅ millisecondsSinceEpoch
✅ microsecondsSinceEpoch
✅ secondsSinceEpoch
✅ toUTC
✅ Parse
Constructors
✅ Default
✅ Default, only year argument
✅ from DateTime
Annotations
Check failure on line 23 in test/blob_ctime_builder_test.dart
github-actions / Unit Tests macOS-latest stable
test/blob_ctime_builder_test.dart ► Basic
Failed test found in:
test-results.json
Error:
FormatException: Filter error, bad data
Raw output
dart:io _FilterSink.add
package:dart_git/plumbing/pack_file.dart 152:15 PackFile._decodeObject
package:dart_git/plumbing/pack_file.dart 132:22 PackFile._objectByOffset
package:dart_git/plumbing/pack_file.dart 85:12 PackFile._objectByHash
package:dart_git/plumbing/pack_file.dart 72:15 PackFile.object
package:dart_git/storage/object_storage_fs.dart 49:26 ObjectStorageFS.read
package:dart_git/storage/object_storage_cache.dart 24:17 ObjectStorageCache.read
package:dart_git/storage/object_storage_extensions.dart 44:41 ObjectStorageExtension.readCommit
package:dart_git/plumbing/commit_iterator.dart 58:29 commitIteratorBFSFiltered
dart:async _SyncStarIterator.moveNext
package:dart_git/vistors.dart 44:24 Visitors.visitTree
test/blob_ctime_builder_test.dart 23:10 main.<fn>
Check failure on line 13 in test/commands/commit_test.dart
github-actions / Unit Tests macOS-latest stable
test/commands/commit_test.dart ► Commit all Initial Repo Test - Single File
Failed test found in:
test-results.json
Error:
TimeoutException after 0:00:30.000000: Test timed out after 30 seconds. See https://pub.dev/packages/test#timeouts
Raw output
Real Git: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_real_2peltP
Dart Git: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_dart_W8oVQY
dart:isolate _RawReceivePort._handleMessage
Check failure on line 211 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/merge_delete_test.dart ► merge del2
Failed test found in:
test-results.json
Error:
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge del2, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_LtMEuJ/merge-delete_dart)
Raw output
dartgit>$ git merge del2
dart:async _Completer.completeError
package:process_run/src/shell.dart 659:21 Shell._lockedRunExecutableArguments.<fn>
===== asynchronous gap ===========================
dart:async Future.catchError
package:process_run/src/shell.dart 653:10 Shell._lockedRunExecutableArguments
package:process_run/src/shell.dart 350:35 Shell.run.<fn>
package:process_run/src/shell.dart 446:20 Shell._runLocked.<fn>
package:synchronized/src/basic_lock.dart 31:24 BasicLock.synchronized
package:process_run/src/shell.dart 444:21 Shell._runLocked
package:process_run/src/shell.dart 323:12 Shell.run
package:process_run/src/shell.dart 75:8 run
test/lib.dart 211:31 runDartGitCommand
test/commands/common.dart 131:15 testGitCommand
test/commands/merge_delete_test.dart 21:21 main.<fn>
Check failure on line 211 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/merge_test.dart ► merge fast-forward
Failed test found in:
test-results.json
Error:
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge fast-forward, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_Ew2ypi/merge_dart)
Raw output
dartgit>$ git merge fast-forward
dart:async _Completer.completeError
package:process_run/src/shell.dart 659:21 Shell._lockedRunExecutableArguments.<fn>
===== asynchronous gap ===========================
dart:async Future.catchError
package:process_run/src/shell.dart 653:10 Shell._lockedRunExecutableArguments
package:process_run/src/shell.dart 350:35 Shell.run.<fn>
package:process_run/src/shell.dart 446:20 Shell._runLocked.<fn>
package:synchronized/src/basic_lock.dart 31:24 BasicLock.synchronized
package:process_run/src/shell.dart 444:21 Shell._runLocked
package:process_run/src/shell.dart 323:12 Shell.run
package:process_run/src/shell.dart 75:8 run
test/lib.dart 211:31 runDartGitCommand
test/commands/common.dart 131:15 testGitCommand
test/commands/merge_test.dart 24:21 main.<fn>
Check failure on line 211 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/merge_test.dart ► merge up-to-date
Failed test found in:
test-results.json
Error:
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge up-to-date, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_Ew2ypi/merge_dart)
Raw output
dartgit>$ git merge up-to-date
dart:async _Completer.completeError
package:process_run/src/shell.dart 659:21 Shell._lockedRunExecutableArguments.<fn>
===== asynchronous gap ===========================
dart:async Future.catchError
package:process_run/src/shell.dart 653:10 Shell._lockedRunExecutableArguments
package:process_run/src/shell.dart 350:35 Shell.run.<fn>
package:process_run/src/shell.dart 446:20 Shell._runLocked.<fn>
package:synchronized/src/basic_lock.dart 31:24 BasicLock.synchronized
package:process_run/src/shell.dart 444:21 Shell._runLocked
package:process_run/src/shell.dart 323:12 Shell.run
package:process_run/src/shell.dart 75:8 run
test/lib.dart 211:31 runDartGitCommand
test/commands/common.dart 131:15 testGitCommand
test/commands/merge_test.dart 24:21 main.<fn>
Check failure on line 211 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/merge_test.dart ► merge merge-conflict -X ours
Failed test found in:
test-results.json
Error:
ShellException(/Users/runner/work/dart-git/dart-git/bin/main.dart merge merge-conflict -X ours, exitCode 1, workingDirectory: /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_Ew2ypi/merge_dart)
Raw output
dartgit>$ git merge merge-conflict -X ours
dart:async _Completer.completeError
package:process_run/src/shell.dart 659:21 Shell._lockedRunExecutableArguments.<fn>
===== asynchronous gap ===========================
dart:async Future.catchError
package:process_run/src/shell.dart 653:10 Shell._lockedRunExecutableArguments
package:process_run/src/shell.dart 350:35 Shell.run.<fn>
package:process_run/src/shell.dart 446:20 Shell._runLocked.<fn>
package:synchronized/src/basic_lock.dart 31:24 BasicLock.synchronized
package:process_run/src/shell.dart 444:21 Shell._runLocked
package:process_run/src/shell.dart 323:12 Shell.run
package:process_run/src/shell.dart 75:8 run
test/lib.dart 211:31 runDartGitCommand
test/commands/common.dart 131:15 testGitCommand
test/commands/merge_test.dart 24:21 main.<fn>
Check failure on line 248 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/reset_test.dart ► reset --hard HEAD^
Failed test found in:
test-results.json
Error:
Expected: <0>
Actual: <1>
Dart command `reset --hard HEAD^` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_9PFVgL/merge_dart
Raw output
dartgit>$ git reset --hard HEAD^
package:matcher expect
test/lib.dart 248:5 runDartGitCommand
Check failure on line 248 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/single_commands_test.dart ► write-tree
Failed test found in:
test-results.json
Error:
Expected: <0>
Actual: <1>
Dart command `write-tree` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
Raw output
dartgit>$ git write-tree
package:matcher expect
test/lib.dart 248:5 runDartGitCommand
Check failure on line 248 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/single_commands_test.dart ► diff-tree 938c320fd826711ab4e3f5db5cf2f4557ff75522
Failed test found in:
test-results.json
Error:
Expected: <0>
Actual: <1>
Dart command `diff-tree 938c320fd826711ab4e3f5db5cf2f4557ff75522` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
Raw output
dartgit>$ git diff-tree 938c320fd826711ab4e3f5db5cf2f4557ff75522
package:matcher expect
test/lib.dart 248:5 runDartGitCommand
Check failure on line 248 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/single_commands_test.dart ► diff-tree 6216f82ecd10cac78c2b90ddcc4d0d9dc6f3d711
Failed test found in:
test-results.json
Error:
Expected: <0>
Actual: <1>
Dart command `diff-tree 6216f82ecd10cac78c2b90ddcc4d0d9dc6f3d711` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
Raw output
dartgit>$ git diff-tree 6216f82ecd10cac78c2b90ddcc4d0d9dc6f3d711
package:matcher expect
test/lib.dart 248:5 runDartGitCommand
Check failure on line 248 in test/lib.dart
github-actions / Unit Tests macOS-latest stable
test/commands/single_commands_test.dart ► checkout 1 file
Failed test found in:
test-results.json
Error:
Expected: <0>
Actual: <1>
Dart command `checkout LICENSE` failed in /var/folders/4d/0gnh84wj53j7wyk695q0tc_80000gn/T/_git_WM9iB6/dart_git_dart
Raw output
dartgit>$ git checkout LICENSE
package:matcher expect
test/lib.dart 248:5 runDartGitCommand
Loading