Vicent Martí
450a78bf07
Merge pull request #1545 from ethomson/checkout_dirs_in_use
...
allow checkout to proceed when a dir to be removed is in use (win32)
2013-05-06 06:33:02 -07:00
Russell Belfer
0ed3fa8a37
Merge pull request #1550 from nvloff/fix_typo_in_branch_h
...
branch.h: fix typo in docs
2013-05-06 05:53:13 -07:00
Nikolai Vladimirov
72662202ac
branch.h: fix typo in docs
2013-05-06 15:31:26 +03:00
Russell Belfer
3e96e3391c
Merge pull request #1549 from nulltoken/fix/from_oids
...
Strict/lax commit API
2013-05-05 08:01:18 -07:00
nulltoken
467cbec73d
commit: make create_from_oids() accept plain oid
2013-05-05 16:48:34 +02:00
nulltoken
ce72e399d2
commit: guard create() against not owned trees
2013-05-05 16:47:07 +02:00
Edward Thomson
e09d18eed6
allow checkout to proceed when a dir to be removed is in use (win32)
2013-05-03 18:54:47 -05:00
Vicent Marti
dfec726bba
odb: Do not error out if an alternate ODB is missing
2013-05-03 23:30:54 +02:00
Vicent Marti
b641c00eeb
clar: Always generate the test suite
2013-05-03 17:35:50 +02:00
Vicent Martí
811c761fe1
Merge pull request #1540 from ethomson/leaks
...
fix some leaks
2013-05-03 08:19:12 -07:00
Edward Thomson
d80416384f
fix some leaks
2013-05-02 20:43:45 -05:00
Vicent Martí
42b2bcf038
Merge pull request #1538 from ethomson/merge_warning_cleanup
...
braces
2013-05-02 13:42:16 -07:00
Edward Thomson
5e151329fb
braces
2013-05-02 15:20:21 -05:00
Vicent Martí
dc83d32ade
Merge pull request #1537 from ethomson/merge_warning_cleanup
...
puns are not funny; type punning especially so
2013-05-02 13:01:44 -07:00
Edward Thomson
4e7c15608f
puns are not funny; type punning especially so
2013-05-02 14:58:40 -05:00
Vicent Martí
af7689ea24
Merge pull request #1535 from carlosmn/pack-threading
...
Switch to index_version as "git_pack_file is ready" flag
2013-05-02 09:50:34 -07:00
Carlos Martín Nieto
0ddfcb40d5
Switch to index_version as "git_pack_file is ready" flag
...
We use p->index_map.data to check whether the struct has been set up
and all the information about the index is stored there. This variable
gets set up halfway through the setup process, however, and a thread
can come along and use fields that haven't been written to yet.
Crucially, pack_entry_find_offset() needs to read the index version
(which is written after index_map) to know the offset and stride
length to pass to sha1_entry_pos(). If these values are wrong,
assertions in it will fail, as it will be reading bogus data.
Make index_version the last field to be written and switch from using
p->index_map.data to p->index_version as "git_pack_file is ready" flag
as we can use it to know if every field has been written.
2013-05-02 18:27:02 +02:00
Vicent Martí
8a497ec9ad
Merge pull request #1531 from libgit2/jk/peeled-refs
...
refdb_fs: do not require peeled packed refs to be tags
2013-05-02 09:21:46 -07:00
Jeff King
a591ed3ea9
refdb_fs: respect PEELING_STANDARD
...
We only set our negative flag for PEELING_FULL; we can fall
back to the lesser PEELING_STANDARD if our ref is in the
refs/tags/ hierarchy.
2013-05-02 12:06:46 -04:00
Vicent Marti
822645f629
refdb_fs: Only strstr the traits line
2013-05-02 17:48:49 +02:00
Vicent Marti
1022db2b68
refdb_fs: Traits are always surrounded by spaces
...
This makes parsing easier! :p
2013-05-02 17:42:09 +02:00
Vicent Marti
f69db390fb
refdb_fs: store "cannot be peeled" flag for packed refs
...
Fixes #1532
2013-05-02 17:39:14 +02:00
Vicent Marti
3bb00f3360
refdb_fs: implement the fully-peeled trait
2013-05-02 17:17:46 +02:00
Carlos Martín Nieto
34bd59992e
Revert "Protect sha1_entry_pos call with mutex"
...
This reverts commit 8c535f3f68
2013-05-02 17:14:05 +02:00
Jeff King
7edb9071da
refdb_fs: do not require peeled packed refs to be tags
...
Older versions of git would only write peeled entries for
items under refs/tags/. Newer versions will write them for
all refs, and we should be prepared to handle that.
2013-05-02 11:07:20 -04:00
Vicent Martí
d966310cab
Merge pull request #1529 from arrbee/more-packfile-locking
...
More packfile locking
2013-05-02 03:37:28 -07:00
Russell Belfer
8c535f3f68
Protect sha1_entry_pos call with mutex
...
There is an occasional assertion failure in sha1_entry_pos from
pack_entry_find_index when running threaded. Holding the mutex
around the code that grabs the index_map data and processes it
makes this assertion failure go away.
2013-05-02 03:34:56 -07:00
Russell Belfer
81b7dec4ee
Fix some compile warnings and trailing whitespace
2013-05-02 03:06:34 -07:00
Russell Belfer
d82d66c96d
Extra threading tests
...
We need to hammer the packfile open phase harder in the thread
tests, in addition to the cache API.
2013-05-02 03:05:21 -07:00
Russell Belfer
9d2f841a5d
Add extra locking around packfile open
...
We were still seeing a few issues in threaded access to packs.
This adds extra locks around the opening of the mwindow to
avoid a different race.
2013-05-02 03:03:54 -07:00
Russell Belfer
69c50f4c44
Merge pull request #1527 from ethomson/checkout_allow_empty_dirs
...
allow empty dirs to exist when doing checkout
2013-05-01 13:47:00 -07:00
Vicent Marti
8cddf9b83a
refdb: Properly load namespaces
2013-05-01 19:13:32 +02:00
Edward Thomson
0cc7d8df19
allow empty dirs to exist when doing checkout
2013-05-01 09:50:40 -05:00
Vicent Marti
e1807113c4
merge: Warning noise
2013-05-01 15:31:23 +02:00
Vicent Marti
2ba55c1f0d
refdb: Proper namespace root
2013-05-01 15:20:08 +02:00
Vicent Martí
758e50c51e
Merge pull request #1389 from ethomson/merge_trees
...
Merge trees
2013-05-01 06:18:09 -07:00
Vicent Martí
cfcdbc100a
Merge pull request #1523 from libgit2/vmg/namespaces
...
Namespace support
2013-05-01 03:03:17 -07:00
Edward Thomson
75d1c8c664
move NAME and REUC extensions to sys/
2013-04-30 17:33:11 -05:00
Edward Thomson
0462fba538
renames!
2013-04-30 16:01:11 -05:00
Edward Thomson
bec65a5e99
merge!
2013-04-30 15:31:31 -05:00
Vicent Marti
bade51948c
lol namespaces
2013-04-30 21:02:13 +02:00
Vicent Martí
5e2261aca8
Merge pull request #1507 from arrbee/fix-look-inside-untracked-directory
...
Update diff handling of "untracked" directories
2013-04-30 10:29:46 -07:00
Russell Belfer
5fa7e46984
Fix some formatting inconsistency
2013-04-30 04:27:46 -07:00
Russell Belfer
61c00541ac
Update comment for clarity
2013-04-30 04:25:56 -07:00
Russell Belfer
a66c4bc846
More tests for diff untracked directories
...
This includes more tests for various scenarios when diff includes
an untracked directory in the workdir with contents either ignored
or not.
2013-04-30 04:25:56 -07:00
Russell Belfer
e26b14c034
Update diff handling of untracked directories
...
When diff encounters an untracked directory, there was a shortcut
that it took which is not compatible with core git. This makes
the default behavior no longer take that shortcut and instead look
inside the untracked directory to see if there are any untracked
files within it. If there are not, then the directory is treated
as an ignore directory instead of an untracked directory. This
has implications for the git_status APIs.
2013-04-30 04:25:56 -07:00
Russell Belfer
fdb3034e72
Reorganize diff code into functions
...
In preparation for more changes to the internal diff logic, it
seemed wise to split the very large git_diff__from_iterators into
separate functions that handle the four main cases (unmatched old
item, unmatched new item, unmatched new directory, and matched
old and new items). Hopefully this will keep the logic easier to
follow even as more cases have to be added to this code.
2013-04-30 04:25:56 -07:00
Vicent Marti
7dcda3aa37
object: haha
2013-04-30 13:19:02 +02:00
Vicent Marti
0b726701f3
object: Explicitly define helper API methods for all obj types
2013-04-30 13:13:38 +02:00
Vicent Martí
cd2ed9f0cc
Merge pull request #1518 from arrbee/export-oid-comparison
...
Remove most inlines from the public API
2013-04-30 04:02:52 -07:00
