Sebastian Bauer
707ede8633
Compile regexp dependency when AMIGA is defined.
...
Before it was compiled when CMake was actually run on AmigaOS.
2013-01-10 09:19:11 +01:00
Sebastian Bauer
c57c4af327
Disable SSL when compiling for AmigaOS for now.
2013-01-10 09:16:39 +01:00
Sebastian Bauer
e9bb730c36
Added missing curly brackets and fixed compiler warnings.
2013-01-10 09:16:14 +01:00
Ben Straub
520dcc1c00
Move credential helpers to their own (optional) header
2013-01-09 13:31:17 -08:00
Ben Straub
ffb02b1630
Expose stock user/pass credential utility
2013-01-09 13:31:17 -08:00
Philip Kelley
fcc48d1fce
Add a failing test for autocrlf filters
2013-01-09 12:37:22 -05:00
Vicent Martí
252b24049c
Merge pull request #1214 from schu/push-handle-tags
...
push: properly handle tags
2013-01-09 08:43:19 -08:00
Michael Schubert
abeefbbe18
push: properly handle tags
...
Currently, push doesn't really handle tags when queueing objects. Fix
it.
2013-01-09 17:05:21 +01:00
Michael Schubert
f85b62840a
tests-clar/network: remove unused CREATE_BLOB
2013-01-09 16:44:12 +01:00
Jameson Miller
087f64d3e3
Relax refspecs accepted by push
2013-01-09 16:15:58 +01:00
Vicent Martí
11fccddcb5
Merge pull request #1212 from arrbee/fix-diff-empty-file
...
Resolve crash with diff against empty file
2013-01-08 17:16:47 -08:00
Russell Belfer
de59055017
Resolve crash with diff against empty file
...
It is not legal inside our `p_mmap` function to mmap a zero length
file. This adds a test that exercises that case inside diff and
fixes the code path where we would try to do that.
The fix turns out not to be a lot of code since our default file
content is already initialized to "" which works in this case.
Fixes #1210
2013-01-08 17:11:11 -08:00
Vicent Martí
f7e4a7c2d5
Merge pull request #1209 from ethomson/update_copyright
...
update copyrights
2013-01-08 15:34:55 -08:00
Edward Thomson
359fc2d241
update copyrights
2013-01-08 17:31:27 -06:00
Vicent Martí
d63dc61dd7
Merge pull request #1208 from ethomson/ppc_sha1_asm_deadness
...
remove ppc sha1 asm
2013-01-08 15:04:05 -08:00
Edward Thomson
8f09f46498
remove ppc sha1 asm
2013-01-08 16:55:16 -06:00
Vicent Martí
d4df288ddc
Merge pull request #1207 from ethomson/cmake_comment_len_sanity
...
keep comments at < 80 chars
2013-01-08 14:41:25 -08:00
Edward Thomson
d335e73a6a
keep comments at < 80 chars
2013-01-08 16:37:19 -06:00
Vicent Martí
368a2b4e3e
Merge pull request #1204 from arrbee/diff-blob-to-buffer
...
Have diff blob to buffer share code (and add tests)
2013-01-07 18:33:50 -08:00
Russell Belfer
f2b7f7a6cb
Share git_diff_blobs/git_diff_blob_to_buffer code
...
This moves the implementation of these two APIs into common code
that will be shared between the two. Also, this adds tests for
the `git_diff_blob_to_buffer` API. Lastly, this adds some extra
`const` to a few places that can use it.
2013-01-07 15:44:22 -08:00
Ignacio Casal Quinteiro
f6234cd994
Introduce git_diff_blob_to_buffer
2013-01-07 14:13:18 -08:00
Vicent Martí
7dfc5c3c6c
Merge pull request #1203 from phkelley/reverse_dak
...
Revert changes from git/git diff-delta.c by dak@gnu.org , proski@gnu.org
2013-01-07 07:34:34 -08:00
Philip Kelley
8e89839d29
Merge pull request #1202 from martinwoodward/add-florian
...
Add Florian Forster to hall of fame
2013-01-07 07:06:18 -08:00
Philip Kelley
f6ed5e2d05
Revert changes from git/git diff-delta.c by dak@gnu.org, proski@gnu.org
2013-01-07 09:53:43 -05:00
Martin Woodward
32f59bfb18
Add Florian Forster to hall of fame
...
Permission recieved from Florian Forster on Jan 07 2013 to include
any changes of his from core Git into LibGit2.
2013-01-07 14:52:42 +00:00
Vicent Martí
05e9fc5835
Merge pull request #1200 from ethomson/merge_cleanup
...
merge cleanup should actually cleanup and the test should actually test
2013-01-06 18:56:40 -08:00
Edward Thomson
c31ae146b4
merge cleanup should actually cleanup and the test should actually test
2013-01-06 18:38:29 -06:00
Kevin Sawicki
7eb222fc7d
Correct typos in documentation
2013-01-06 10:39:35 -08:00
Kevin Sawicki
e5562e181c
Revert "Tab align value of GIT_FILEMODE_BLOB_EXECUTABLE"
...
This reverts commit 47fbcbb5a8
2013-01-06 10:12:05 -08:00
Kevin Sawicki
47fbcbb5a8
Tab align value of GIT_FILEMODE_BLOB_EXECUTABLE
2013-01-06 10:02:37 -08:00
Vicent Martí
8b107c6770
Merge pull request #1198 from nulltoken/travis/run-valgrind-on-success
...
travis: Only run Valgrind when all tests pass
2013-01-06 09:12:02 -08:00
nulltoken
ced8eff1e5
travis: Only run Valgrind when all tests pass
2013-01-06 17:37:38 +01:00
Vicent Martí
5df7ad3ece
Merge pull request #1196 from scunz/allow_clone_without_master_branch
...
Allow to clone repositories that don't have a `master` branch
2013-01-06 07:56:45 -08:00
Vicent Martí
74f880a639
Merge pull request #1197 from nulltoken/travis/run-online-tests
...
travis: Include the online suite when running against Travis
2013-01-06 07:56:08 -08:00
nulltoken
d01fe38061
reset: Fix a memory leak
2013-01-06 16:22:28 +01:00
nulltoken
b97fabfad5
tests: Fix some memory leaks
2013-01-06 16:22:24 +01:00
nulltoken
d1aee4775a
clone: Fix a memory leak
2013-01-06 15:09:27 +01:00
nulltoken
09556895b7
travis: Include the online suite when running against Travis
2013-01-06 14:40:32 +01:00
Sascha Cunz
2ba6f3c7f1
Allow to clone repositories that don't have a master branch
...
Before this, we error out from `reference_matches_remote_head` if the
reference we're searching for does not exist.
Since we explicitly check if master is existing in `update_head_to_remote`
and error out if it doesn't, a repository without master branch could
not be cloned.
In fact this was later clobbered by what is fixed in #1194 .
However, this patch introduces a `found` member in `head_info` and sets
it accordingly. That also saves us from checking the string length of
`branchname` a few times.
2013-01-06 14:30:52 +01:00
Vicent Martí
f9b4adbe54
Merge pull request #1194 from libgit2/dont-clobber-errors
...
git_mwindow_file_deregister() shouldn't return errors
2013-01-05 18:52:09 -08:00
Scott J. Goldman
f9b55bcb5f
git_mwindow_file_deregister() shouldn't return errors
...
As a function that appears to only be called on error paths, I don't
think it makes sense for it to return an error, or clobber the global
giterr. Note that no existing callsites actually check the return
code.
In my own application, there are errors where the real error ends
up being hidden, as git_mwindow_file_deregister() clobbers the
global giterr. I'm not sure this error is even relevant?
2013-01-05 18:27:24 -08:00
Vicent Martí
d74b1bc529
Merge pull request #1131 from libgit2/correct-ahead-behind
...
Fix an issue with ahead-behind for lopsided traversal
2013-01-05 15:44:19 -08:00
Vicent Martí
2b7b3e1fae
Merge pull request #1193 from libgit2/no-newline-packed-refs
...
Handle packed refs with no trailing newline
2013-01-05 04:30:24 -08:00
Scott J. Goldman
ef82ff30f6
Handle packed refs with no trailing newline
...
I saw a repo in the wild today which had a master branch ref which was packed, but had no trailing newline. Git handled it fine, but libgit2 choked on it. Fix seems simple enough. If we don't see a newline, assume the end of the buffer is the end of the ref line.
2013-01-05 00:46:39 -08:00
Vicent Martí
7511d8b42d
Merge pull request #1192 from arrbee/fix-win32-checkout-test
...
Fix win32 checkout test
2013-01-04 17:28:09 -08:00
Russell Belfer
2f0895393d
Actually fix win32 checkout test
...
It turns out that using REMOVE_UNTRACKED with checkout for this
particular test was causing the .gitattributes file to be removed
and so we do have to allow for the CRs in the created file...
2013-01-04 17:17:37 -08:00
Russell Belfer
bebdbcd442
Fix crlf issue with checkout tests
...
Move some checkout utility functions into a shared file and fix
some crlf filtering issues when verifying file contents.
2013-01-04 16:56:21 -08:00
Vicent Martí
7a68142e22
Merge pull request #1191 from maxpow4h/fix-format-string
...
Fixed size_t format string warning
2013-01-04 16:49:46 -08:00
Maxwell Swadling
79ff264e2f
Fixed size_t format string warning
2013-01-05 11:34:19 +11:00
Vicent Martí
cfc7b835d6
Merge pull request #1118 from arrbee/fix-reset-hard
...
Fix checkout corner cases, index handling, and reset hard behavior
2013-01-04 16:14:49 -08:00
