Vicent Martí
8c6329eec9
Merge pull request #692 from nulltoken/fix/delete-branch_ENOTFOUND
...
branch: make git_branch_delete() return GIT_ENOTFOUND when the branch doesn't exist
2012-05-14 11:25:40 -07:00
Vicent Martí
c9e9ec97d2
Merge pull request #688 from hanwen/master
...
See issue https://github.com/libgit2/libgit2/issues/680
2012-05-14 11:24:37 -07:00
Vicent Martí
e49cb1687e
Merge pull request #671 from nulltoken/topic/blob_create_fromdisk
...
Add git_blob_create_fromdisk()
2012-05-14 11:03:30 -07:00
Vicent Martí
72bfde9790
Merge pull request #681 from scottjg/solaris-fixes
...
Fix build/runtime issues on Solaris
2012-05-14 11:01:14 -07:00
Vicent Martí
27f5b7cfed
Merge pull request #682 from arrbee/attribute-cache-buster
...
Attribute cache buster
2012-05-14 10:58:23 -07:00
Scott J. Goldman
212eb09d5f
Add a test to verify FILENAME_MAX
...
Since we now rely on it (at least under Solaris), I figured we probably
want to make sure it's accurate. The new test makes sure that creating a
file with a name of length FILENAME_MAX+1 fails.
2012-05-13 23:12:51 -07:00
nulltoken
7327a090e2
mergebase: enhance test code coverage
2012-05-13 14:14:08 +02:00
Carlos Martín Nieto
f0b350eb52
tests: make sure we clean up in objects/blob/write.c
2012-05-13 11:28:49 +02:00
nulltoken
6ca9643c96
blob: Add git_blob_create_fromdisk()
...
This function will create blobs in the object database from files anywhere on the filesystem. This can be run against bare and non-bare repositories.
2012-05-13 11:28:49 +02:00
nulltoken
341a7136f6
branch: make git_branch_delete() return GIT_ENOTFOUND when the branch doesn't exist
2012-05-13 10:30:13 +02:00
Han-Wen Nienhuys
24634c6fd0
Handle duplicate objects from different backends in git_odb_read_prefix().
2012-05-12 15:50:19 -03:00
Vicent Martí
b72969e064
Merge pull request #683 from arrbee/better-repo-init
...
Improve repo initialization to be more like git
2012-05-12 01:51:58 -07:00
nulltoken
e28c37761b
object: make git_object_lookup() return GIT_ENOTFOUND when searching for an existing object by specifying an incorrect type
...
This fix complements cb0ce16bbe
and cover the following additional use cases
- retrieving an object which has been previously searched, found and cached
- retrieving an object through an non ambiguous abbreviated id
2012-05-11 23:56:23 +02:00
Russell Belfer
db62807215
Fixed leaks and added tests
2012-05-11 12:16:19 -07:00
Russell Belfer
a7c09c0d6b
Fixed mode on clar
2012-05-10 11:15:37 -07:00
Russell Belfer
dc13f1f7d7
Add cache busting to attribute cache
...
This makes the git attributes and git ignores cache check
stat information before using the file contents from the
cache. For cached files from the index, it checks the SHA
of the file instead. This should reduce the need to ever
call `git_attr_cache_flush()` in most situations.
This commit also fixes the `git_status_should_ignore` API
to use the libgit2 standard parameter ordering.
2012-05-10 11:12:43 -07:00
Vicent Martí
a9d9965b35
clar: Update from upstream
2012-05-09 22:55:01 +02:00
nulltoken
1956693fa0
Fix MSVC compilation issue
...
exp() is already defined in math.h. This leads to LMSVC complaining
..\..\libgit2\tests-clar\diff\blob.c(5): error C2365: 'exp' : redefinition; previous definition was 'function'
Renaming the variable fixes this issue.
2012-05-09 21:14:49 +02:00
Michael Schubert
b470019f7f
tests-clar/diff: fix missing-prototype warning
2012-05-09 18:02:13 +02:00
Vicent Martí
e65752bb32
Merge pull request #677 from arrbee/status-without-head
...
Add support for diffing index with no HEAD
2012-05-08 16:06:27 -07:00
Russell Belfer
7e000ab2ec
Add support for diffing index with no HEAD
...
When a repo is first created, there is no HEAD yet and attempting
to diff files in the index was showing nothing because a tree
iterator could not be constructed. This adds an "empty" iterator
and falls back on that when the head cannot be looked up.
2012-05-08 15:03:59 -07:00
Vicent Martí
c99bdacf71
Merge pull request #670 from nulltoken/ntk/topic/clean-commit_message
...
Clean commit and tag messages
2012-05-08 14:13:43 -07:00
Russell Belfer
364f51bdca
Merge pull request #668 from nulltoken/topic/binary-blobs
...
Enhancing the blob diffing experience
2012-05-08 13:56:21 -07:00
Vicent Martí
1f796cd180
Merge pull request #676 from carlosmn/remotes
...
Add git_remote_add() and change signature for _new()
2012-05-08 13:42:11 -07:00
Russell Belfer
19579847f6
Clean up warnings and tests
2012-05-08 13:23:00 -07:00
Carlos Martín Nieto
baaa8a447e
remotes: change git_remote_new's signature
...
Add a fetch refspec arguemnt and make the arguments (name, url,
refspec), as that order makes more sense.
2012-05-08 21:36:40 +02:00
Carlos Martín Nieto
a209a025c6
remote: add git_remote_add()
...
Helper function to create a remote with the default settings
2012-05-08 21:36:40 +02:00
nulltoken
722c08afec
status: Prevent git_status_file() from returning ENOTFOUND when not applicable
2012-05-08 10:05:27 +02:00
nulltoken
464cf248fd
repository: ensure git_repository_discover() returns ENOTFOUND when unable to find a repository given the constraints
2012-05-08 10:05:24 +02:00
nulltoken
0b0957a661
fileops: replace integer usage with more explicit enum in some git_futils_rmdir_r() calls
2012-05-08 10:05:22 +02:00
nulltoken
d7d8a0bfd4
repository: ensure git_repository_open() returns ENOTFOUND when being passed a path leading to no repository
2012-05-08 10:05:20 +02:00
nulltoken
9abb5bca5d
compat: make p_realpath Windows implementation be a bit more POSIX compliant and fail if the provided path does not lead to an existing entry
2012-05-08 10:05:18 +02:00
nulltoken
cb0ce16bbe
object: make git_object_lookup() return GIT_ENOTFOUND when searching for an existing object by specifying an incorrect type
2012-05-08 10:05:14 +02:00
nulltoken
9fb70f378a
remote: make git_remote_load() return GIT_ENOTFOUND when the remote url cannot be retrieved from the config file
2012-05-08 10:05:12 +02:00
Vicent Martí
8d89c8e972
Merge pull request #672 from scottjg/more-mingw32-fixes
...
More mingw32 compilation fixes.
2012-05-07 13:36:02 -07:00
nulltoken
3191ae89c6
compat: make p_open able to accept optional mode when passing the O_CREAT flag
...
This has the nice side effect of making test_attr_repo__staging_properly_normalizes_line_endings_according_to_gitattributes_directives() test pass again on Windows. This test started to fail after commit 674a198
was applied.
2012-05-07 12:18:54 +02:00
nulltoken
9a29f8d56c
diff: fix the diffing of two identical blobs
2012-05-07 12:18:33 +02:00
nulltoken
28ef7f9b28
diff: make git_diff_blobs() able to detect binary blobs
2012-05-07 12:18:32 +02:00
nulltoken
cfe25b13fa
tests: add two binary blobs to attr test repository
...
- edf3dce -> assets.github.com/images/icons/emoji/alien.png?v5
- de863bf -> assets.github.com/images/icons/emoji/heart.png?v5
2012-05-07 12:18:32 +02:00
nulltoken
4f80676182
diff: fix the diffing of a concrete blob against a null one
2012-05-07 12:18:31 +02:00
nulltoken
245c5eaec5
diff: When diffing two blobs, ensure the delta callback parameter is filled with relevant information
2012-05-07 12:18:31 +02:00
nulltoken
458b94503d
commit/tag: ensure the message is cleaned up
...
'git commit' and 'git tag -a' enforce some conventions, like cleaning up excess whitespace and making sure that the last line ends with a '\n'. This fix replicates this behavior.
Fix libgit2/libgit2sharp#117
2012-05-07 12:16:04 +02:00
Carlos Martín Nieto
9b62e40ecd
clar helper: don't dereference giterr_last() if it's NULL
...
It can cause segfaults if the call didn't set an error
2012-05-07 11:29:10 +02:00
Scott J. Goldman
17847c78dd
Update clar to latest version
...
Fixes the mingw32 build issues.
2012-05-06 23:58:41 -07:00
Vicent Martí
cd58c15c58
Merge remote-tracking branch 'scottjg/fix-mingw32' into development
...
Conflicts:
src/netops.c
src/netops.h
src/transports/http.c
tests-clar/clar
2012-05-05 16:47:20 -07:00
Vicent Martí
4ef14af935
Merge pull request #664 from arrbee/attrs-from-index
...
Support git attrs from index (and bare repo)
2012-05-05 14:22:06 -07:00
Vicent Martí
d3a60dc244
Merge pull request #663 from schu/notes-honor-config
...
Honor core.notesRef config option
2012-05-05 14:14:58 -07:00
Scott J. Goldman
35cdd261f3
Fix unsigned/signed comparison on Windows in commitstagedfile.c
2012-05-05 13:54:33 -07:00
Scott J. Goldman
06ac3e7f34
Fix clar generated code to compile on MINGW32
...
MINGW32 does not define _mktemp_s, so we can just use _mktemp instead. See
the non-compressed/non-base64-encoded version of the patch here:
http://gist.github.com/2605249
2012-05-05 13:16:48 -07:00
Vicent Martí
674a198599
clar: Properly create files in helper
2012-05-04 16:05:14 -07:00