diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-25 20:22:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-25 20:22:36 (GMT) |
| commit | a856e7d69f51776e40633d6f1f1f38a7fd64f0d5 (patch) | |
| tree | 33e27e4586004e0ef097f98a83e0fb359b9d637f /t | |
| parent | b3b2aaf0fd6c65f83d5f636bb177d96c88079b13 (diff) | |
| parent | 33286dcd6d79eeb81b74f36a324f260275582639 (diff) | |
| download | git-a856e7d69f51776e40633d6f1f1f38a7fd64f0d5.zip git-a856e7d69f51776e40633d6f1f1f38a7fd64f0d5.tar.gz git-a856e7d69f51776e40633d6f1f1f38a7fd64f0d5.tar.bz2 | |
Merge branch 'ds/commit-graph-lockfile-fix'
Update to ds/generation-numbers topic.
* ds/commit-graph-lockfile-fix:
commit-graph: fix UX issue when .lock file exists
commit-graph.txt: update design document
merge: check config before loading commits
commit: use generation number in remove_redundant()
commit: add short-circuit to paint_down_to_common()
commit: use generation numbers for in_merge_bases()
ref-filter: use generation number for --contains
commit-graph: always load commit-graph information
commit: use generations in paint_down_to_common()
commit-graph: compute generation numbers
commit: add generation number to struct commit
ref-filter: fix outdated comment on in_commit_list
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5318-commit-graph.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index a380419..77d85ae 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -221,4 +221,13 @@ test_expect_success 'write graph in bare repo' ' graph_git_behavior 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1 graph_git_behavior 'bare repo with graph, commit 8 vs merge 2' bare commits/8 merge/2 +test_expect_success 'perform fast-forward merge in full repo' ' + cd "$TRASH_DIRECTORY/full" && + git checkout -b merge-5-to-8 commits/5 && + git merge commits/8 && + git show-ref -s merge-5-to-8 >output && + git show-ref -s commits/8 >expect && + test_cmp expect output +' + test_done |