Jongmin Kim
ac3d33df5d
New upstream version 0.28.1+dfsg.1
2019-05-12 00:29:21 +09:00
Ximin Luo
4b3ec53c78
New upstream version 0.27.4+dfsg.1
2018-08-10 19:43:40 -07:00
Pirate Praveen
eae0bfdcd8
New upstream version 0.27.0+dfsg.1
2018-04-26 18:06:07 +05:30
Adam Niedzielski
c11c08a552
Skip uninteresting commits in revwalk timesort iterator
...
Fixes #4099
2017-03-09 14:01:10 +01:00
Patrick Steinhardt
8acc3b16ef
tests: add merge-conflict branch for testrepo
...
Add a new branch that causes a merge conflict to `testrepo` so
that we are able to test merging in worktrees.
2017-02-13 10:13:02 +01:00
Adam Niedzielski
390431c322
revwal: add failing test for walking with topo-sort
2017-02-02 16:01:37 +01:00
Carlos Martín Nieto
48c64362e4
revwalk: port over the topological sorting
...
After porting over the commit hiding and selection we were still left
with mistmaching output due to the topologial sort.
This ports the topological sorting code to make us match with our
equivalent of `--date-order` and `--topo-order` against the output
from `rev-list`.
2016-10-06 11:04:55 +02:00
Carlos Martín Nieto
6708618c10
revwalk: get closer to git
...
We had some home-grown logic to figure out which objects to show during
the revision walk, but it was rather inefficient, looking over the same
list multiple times to figure out when we had run out of interesting
commits. We now use the lists in a smarter way.
We also introduce the slop mechanism to determine when to stpo
looking. When we run out of interesting objects, we continue preparing
the walk for another 5 rounds in order to make it less likely that we
miss objects in situations with complex graphs.
2016-10-06 11:04:55 +02:00
Edward Thomson
565fb8dcd4
revwalk: introduce tests that hide old commits
...
Introduce some tests that show some commits, while hiding some commits
that have a timestamp older than the common ancestors of these two
commits.
2016-10-06 11:04:55 +02:00
Vicent Marti
b656e5eb4f
merge: Fix memory leak in test
2015-11-02 13:47:04 +01:00
Vicent Marti
85196232e8
Add test case
2015-11-02 13:47:04 +01:00
Vicent Marti
bbe1957b8c
tests: Fix warnings
2015-10-21 12:09:29 +02:00
Vicent Marti
307c4a2b6d
signature: Strip crud just like Git does
2015-10-21 11:58:44 +02:00
Carlos Martín Nieto
5ffdea6f65
revwalk: make commit list use 64 bits for time
...
We moved the "main" parsing to use 64 bits for the timestamp, but the
quick parsing for the revwalk did not. This means that for large
timestamps we fail to parse the time and thus the walk.
Move this parser to use 64 bits as well.
2015-10-14 16:54:13 +02:00
Carlos Martín Nieto
5a503fffbc
revwalk: add failing test for hiding and then pushing a commit
...
When we hide a commit which we later push into the revwalk, we do not
handle this well and return commits which we should not.
2015-04-08 23:42:36 +02:00
Edward Thomson
60561d5446
tests: update for new test data
2015-02-02 22:46:43 -05:00
Edward Thomson
4b1b2bd9eb
revwalk::mergebase test: free memory
2014-10-26 22:27:58 -04:00
Arthur Schreiber
eca07bcd83
Add git_merge_bases_many.
2014-10-09 14:19:00 +02:00
Ciro Santilli
3b2cb2c91e
Factor 40 and 41 constants from source.
2014-09-16 13:07:04 +02:00
Vicent Marti
46a13f3247
Merge pull request #2481 from libgit2/cmn/oidarray
...
merge: expose multiple merge bases
2014-08-29 18:19:56 +02:00
Carlos Martín Nieto
e07aebb4e2
Fix ahead-behind tests
...
The logic was reversed. I have checked manually each pair with git and
adjusted the expectation to what git status prints.
2014-08-28 13:34:42 +02:00
Carlos Martín Nieto
7db0e6ee48
merge: expose multiple merge bases
...
We always calculate multiple merge bases, but up to now we had only
exposed the "best" merge base.
Introduce git_oidarray which analogously to git_strarray lets us return
multiple ids.
2014-07-27 17:17:22 +02:00
Edward Thomson
9879fee184
revwalk::simplify test should test
...
The revwalk::simplify test was not actually tested the values from
the revwalk against the expected. (Further, the expected had two
IDs transposed.)
2014-07-01 14:40:16 -04:00
Edward Thomson
0cee70ebb7
Introduce cl_assert_equal_oid
2014-07-01 14:40:16 -04:00
Anurag Gupta
3bc3d79761
No need to find merge base.
2014-03-31 15:15:32 -07:00
Edward Thomson
2b848e47c1
Decorate unused params as unused in revwalk::hidecb tests
2014-03-26 12:33:37 -05:00
Anurag Gupta
34ffe22344
Modified test for revwalk_hidecb
2014-03-24 11:21:01 -07:00
Anurag Gupta
7ca1584b47
Conforming to libgit2 coding style.
2014-03-24 11:20:31 -07:00
Anurag Gupta
3a666071d9
Unit Tests for hide_cb in revwalk
2014-03-24 11:20:13 -07:00
Aimeast
0aee025bef
Implement git_merge_base_octopus
2014-03-18 22:31:14 +08:00
Russell Belfer
5302a88538
Fix pqueue sort boundary condition bug
...
If the pqueue comparison fn returned just 0 or 1 (think "a<b")
then the sort order of returned items could be wrong because there
was a "< 0" that really needed to be "<= 0". Yikes!!!
2014-03-12 11:21:55 -07:00
Carlos Martín Nieto
d18209eef9
revwalk: add a test for pushing all references
...
This used to be broken, let's make sure we don't break this use-case.
2014-02-05 12:16:44 +01:00
Carlos Martín Nieto
d465e4e980
revwalk: ignore wrong object type in glob pushes
...
Pushing a whole namespace can cause us to attempt to push non-committish
objects. Catch this situation and special-case it for ignoring this.
2014-02-05 12:16:44 +01:00
Carlos Martín Nieto
b4ef67d5eb
revwalk: add a failing test for pushing "tags"
...
This shows that pusing a whole namespace can be problematic.
2014-02-05 12:16:37 +01:00
Ben Straub
1782038144
Rename tests-clar to tests
2013-11-14 14:05:52 -08:00
