]>
git.proxmox.com Git - libgit2.git/log
nulltoken [Sat, 10 Nov 2012 20:01:05 +0000 (21:01 +0100)]
index: refine add_from_workdir() error report
nulltoken [Sat, 10 Nov 2012 19:42:45 +0000 (20:42 +0100)]
index: make git_index_new() work with a NULL path
nulltoken [Sat, 10 Nov 2012 15:43:05 +0000 (16:43 +0100)]
tests: Add missing assertions
Vicent Martí [Fri, 9 Nov 2012 21:19:32 +0000 (13:19 -0800)]
Merge pull request #1058 from pwkelley/development
Fixes for two segfaults
Vicent Martí [Fri, 9 Nov 2012 21:15:57 +0000 (13:15 -0800)]
Merge pull request #1059 from nulltoken/fix/config-open-level
config: make git_config_open_level() work with an empty config
Philip Kelley [Fri, 9 Nov 2012 20:57:32 +0000 (15:57 -0500)]
Fix a mutex/critical section leak
nulltoken [Fri, 9 Nov 2012 20:49:50 +0000 (21:49 +0100)]
config: make git_config_open_level() work with an empty config
Philip Kelley [Fri, 9 Nov 2012 20:39:25 +0000 (15:39 -0500)]
Fix uninitialized memory in winhttp subtransport on 64-bit
Philip Kelley [Fri, 9 Nov 2012 20:39:10 +0000 (15:39 -0500)]
Fix implementation of strndup to not overrun
Vicent Martí [Fri, 9 Nov 2012 14:16:44 +0000 (06:16 -0800)]
Merge pull request #1052 from delanne/invalid_read
Valgrind reports Invalid Read when the configuration file contains some empty line
Vicent Martí [Fri, 9 Nov 2012 14:15:37 +0000 (06:15 -0800)]
Merge pull request #1057 from bts/patch-1
Update documentation in remote.h
Brian Schroeder [Fri, 9 Nov 2012 05:28:15 +0000 (21:28 -0800)]
Update documentation in remote.h
Philip Kelley [Thu, 8 Nov 2012 16:06:23 +0000 (08:06 -0800)]
Merge pull request #1048 from pwkelley/basic_auth
Basic authentication for http and winhttp
delanne [Thu, 8 Nov 2012 11:28:21 +0000 (12:28 +0100)]
- Update 'tests-clar/resources/config/config11' in order to reproduce the invalidread with the unittest (just added some \n at the end of the file)
- Fix config_file.c
Vicent Martí [Thu, 8 Nov 2012 00:30:55 +0000 (16:30 -0800)]
Merge pull request #1039 from erikvanzijst/erik/tag_without_message
Correctly parse tags lacking a description
Ben Straub [Wed, 7 Nov 2012 20:58:54 +0000 (12:58 -0800)]
Merge pull request #1050 from edubart/development
Fix compilation for mingw32 and cygwin
Eduardo Bart [Wed, 7 Nov 2012 18:10:57 +0000 (16:10 -0200)]
Move inet_pton to posix platform-compatibility layer
Eduardo Bart [Tue, 6 Nov 2012 22:16:53 +0000 (20:16 -0200)]
Fix compilation for mingw32 and cygwin
inet_pton is available only in windows vista or later,
fixed the issue by reimplementing it using WSAStringToAddress
Philip Kelley [Tue, 6 Nov 2012 16:27:23 +0000 (11:27 -0500)]
Don't store no_check_cert; fetch it on demand
Philip Kelley [Tue, 6 Nov 2012 15:32:29 +0000 (07:32 -0800)]
Merge pull request #1025 from ethomson/fetchodb
fetch: Write packs to the ODB instead of directly to disk
Philip Kelley [Tue, 6 Nov 2012 14:36:04 +0000 (09:36 -0500)]
Fix connection leak in http subtransport
Philip Kelley [Tue, 6 Nov 2012 13:52:03 +0000 (08:52 -0500)]
Basic authentication for http and winhttp
Edward Thomson [Mon, 5 Nov 2012 17:33:10 +0000 (11:33 -0600)]
create callback to handle packs from fetch, move the indexer to odb_pack
Russell Belfer [Mon, 5 Nov 2012 19:06:50 +0000 (11:06 -0800)]
Merge pull request #1046 from libgit2/empty-remote-url-crash
Bail out of remote loading if the URL would be NULL
Justin Spahr-Summers [Mon, 5 Nov 2012 19:01:00 +0000 (11:01 -0800)]
'geterr' -> 'giterr'
Justin Spahr-Summers [Mon, 5 Nov 2012 18:58:08 +0000 (10:58 -0800)]
Revert "Don't expect the 'empty-remote-url' remote to be listed"
Apparently git_remote_list() includes even remotes for which git_remote_load() would fail. Sorry @nulltoken, false alarm.
This reverts commit
f358ec143c8c9952227d31cd21c24f8c9be23d3c .
Justin Spahr-Summers [Mon, 5 Nov 2012 18:45:26 +0000 (10:45 -0800)]
Don't expect the 'empty-remote-url' remote to be listed
CC @nulltoken
Justin Spahr-Summers [Mon, 5 Nov 2012 18:44:48 +0000 (10:44 -0800)]
Test for GITERR_INVALID
Russell Belfer [Mon, 5 Nov 2012 18:44:21 +0000 (10:44 -0800)]
Merge pull request #1044 from dahlbyk/repo/state
Fix state when HEAD is not detached
Justin Spahr-Summers [Mon, 5 Nov 2012 18:42:10 +0000 (10:42 -0800)]
Set GITERR_INVALID when encountering a NULL remote URL
Vicent Martí [Mon, 5 Nov 2012 14:54:34 +0000 (06:54 -0800)]
Merge pull request #1034 from carlosmn/packbuilder-foreach
Let the user grab the packfile as it's being written
nulltoken [Mon, 5 Nov 2012 06:49:37 +0000 (07:49 +0100)]
remote: Add malformed remote load test
Justin Spahr-Summers [Mon, 5 Nov 2012 06:01:24 +0000 (22:01 -0800)]
Bail out if remote->url would be NULL
This fixes a crash from attempting to invoke git__strdup() against NULL.
Keith Dahlby [Mon, 5 Nov 2012 03:24:14 +0000 (21:24 -0600)]
Fix Clar link
Keith Dahlby [Sun, 4 Nov 2012 18:13:42 +0000 (12:13 -0600)]
repo: fix state when HEAD is not detached
Philip Kelley [Fri, 2 Nov 2012 18:42:45 +0000 (11:42 -0700)]
Merge pull request #1042 from pwkelley/progress_cb
Fix bytes_received in fetch tests - we weren't calling the callback
Philip Kelley [Fri, 2 Nov 2012 18:34:06 +0000 (14:34 -0400)]
Fix bytes_received in fetch tests - we weren't calling the callback
Russell Belfer [Fri, 2 Nov 2012 17:42:20 +0000 (10:42 -0700)]
Move error capture to top of giterr_set
Erik van Zijst [Fri, 2 Nov 2012 17:28:17 +0000 (10:28 -0700)]
tags: Fixed the tag parser to correctly treat the message field as optional.
This fix makes libgit2 capable of parsing annotated tag objects that lack
the optional message/description field.
Previously, libgit2 treated this field as mandatory and raised a tag_error on
such tags. However, the message field is optional.
An example of such a tag is refs/tags/v2.6.16.31-rc1 in Linux:
$ git cat-file tag refs/tags/v2.6.16.31-rc1
object
afaa018cefb6af63befef1df7d8febaae904434f
type commit
tag v2.6.16.31-rc1
tagger Adrian Bunk <bunk@stusta.de>
1162716505 +0100
$
Vicent Martí [Fri, 2 Nov 2012 17:00:28 +0000 (10:00 -0700)]
Merge pull request #1014 from arrbee/diff-rename-detection
Initial implementation of diff rename detection
Philip Kelley [Fri, 2 Nov 2012 15:43:17 +0000 (08:43 -0700)]
Merge pull request #1040 from ethomson/index_refactor
Free conflict index entries on removal
Philip Kelley [Fri, 2 Nov 2012 15:40:09 +0000 (08:40 -0700)]
Merge pull request #1041 from pwkelley/transports
Prefer GetLastError() for GITERR_OS on Win32
Philip Kelley [Fri, 2 Nov 2012 15:30:55 +0000 (11:30 -0400)]
Prefer GetLastError() for GITERR_OS on Win32
Edward Thomson [Fri, 2 Nov 2012 06:01:21 +0000 (01:01 -0500)]
freeing index entries would be helpful
Vicent Marti [Thu, 1 Nov 2012 22:01:24 +0000 (23:01 +0100)]
LEAAAVE ME ALOOOONEEE
Vicent Martí [Thu, 1 Nov 2012 21:18:40 +0000 (14:18 -0700)]
Merge pull request #1038 from arrbee/doc-fixes
Improve docs, examples, warnings
Russell Belfer [Thu, 1 Nov 2012 21:16:19 +0000 (14:16 -0700)]
Merge pull request #1037 from libgit2/index-open-cleanup
Some more changes to the Index API
Russell Belfer [Thu, 1 Nov 2012 21:08:30 +0000 (14:08 -0700)]
Improve docs, examples, warnings
This improves docs in some of the public header files, cleans
up and improves some of the example code, and fixes a couple
of pedantic warnings in places.
Vicent Marti [Thu, 1 Nov 2012 19:28:28 +0000 (20:28 +0100)]
index: Add `git_index_new`
Vicent Marti [Thu, 1 Nov 2012 19:24:43 +0000 (20:24 +0100)]
index: Fix tests
Vicent Marti [Thu, 1 Nov 2012 19:15:53 +0000 (20:15 +0100)]
index: Add git_index_write_tree
Vicent Marti [Wed, 31 Oct 2012 21:26:57 +0000 (22:26 +0100)]
index: Switch to git_futils_filestamp
Russell Belfer [Thu, 1 Nov 2012 17:57:14 +0000 (10:57 -0700)]
Hide deprecations on MacOS
Why Apple, why?
Russell Belfer [Thu, 1 Nov 2012 17:14:04 +0000 (10:14 -0700)]
Merge pull request #1036 from jamill/text_stat
Update of text stats calculation
Jameson Miller [Thu, 1 Nov 2012 16:11:24 +0000 (12:11 -0400)]
Update of text stats calculation
Do not interpret 0x85 as Next Line (NEL)
char when gathering statistics for a text file.
Vicent Martí [Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)]
Merge pull request #1030 from pwkelley/transports
Reorganize transport architecture
Philip Kelley [Thu, 1 Nov 2012 16:07:42 +0000 (12:07 -0400)]
Http: Set an error for invalid content-type
Philip Kelley [Thu, 1 Nov 2012 15:50:08 +0000 (11:50 -0400)]
Fix a bug in cl_setenv on Windows XP
Philip Kelley [Thu, 1 Nov 2012 14:29:30 +0000 (10:29 -0400)]
Improve consistency of WinHTTP request headers
Philip Kelley [Mon, 29 Oct 2012 17:41:14 +0000 (13:41 -0400)]
Reorganize transport architecture (squashed 3)
Carlos Martín Nieto [Wed, 31 Oct 2012 09:43:08 +0000 (10:43 +0100)]
packbuilder: add accessors for the number of total and written objects
Carlos Martín Nieto [Wed, 31 Oct 2012 09:26:04 +0000 (10:26 +0100)]
packbuilder: add git_packbuilder_foreach
Let the user get each object as a buffer+size pair so they can handle
the packfile content as they need to.
Vicent Marti [Wed, 31 Oct 2012 19:52:16 +0000 (20:52 +0100)]
Merge branch 'config-refresh' into development
Vicent Marti [Wed, 31 Oct 2012 19:52:01 +0000 (20:52 +0100)]
I LIKE THESE NAMES
Russell Belfer [Wed, 31 Oct 2012 18:26:12 +0000 (11:26 -0700)]
Better naming for file timestamp/size checker
Ben Straub [Wed, 31 Oct 2012 17:14:13 +0000 (10:14 -0700)]
Checkout: remove duplicate 100% progress report
Ben Straub [Wed, 31 Oct 2012 17:13:57 +0000 (10:13 -0700)]
Ensure that non-error is not propagated
Russell Belfer [Tue, 30 Oct 2012 19:10:36 +0000 (12:10 -0700)]
Add git_config_refresh() API to reload config
This adds a new API that allows users to reload the config if the
file has changed on disk. A new config callback function to
refresh the config was added.
The modified time and file size are used to test if the file needs
to be reloaded (and are now stored in the disk backend object).
In writing tests, just using mtime was a problem / race, so I
wanted to check file size as well. To support that, I extended
`git_futils_readbuffer_updated` to optionally check file size in
addition to mtime, and I added a new function `git_filebuf_stats`
to fetch the mtime and size for an open filebuf (so that the
config could be easily refreshed after a write).
Lastly, I moved some similar file checking code for attributes
into filebuf. It is still only being used for attrs, but it
seems potentially reusable, so I thought I'd move it over.
Vicent Martí [Tue, 30 Oct 2012 19:04:28 +0000 (12:04 -0700)]
Merge pull request #1017 from arrbee/diff-patch-to-str
Add git_diff_patch_to_str API
Vicent Martí [Tue, 30 Oct 2012 19:03:22 +0000 (12:03 -0700)]
Merge pull request #1026 from nulltoken/repo/state
repo: enhance git_repository_state() detection
Vicent Martí [Tue, 30 Oct 2012 18:51:58 +0000 (11:51 -0700)]
Merge pull request #1029 from ethomson/index_refactor
Index changes
Michael Schubert [Tue, 30 Oct 2012 17:50:59 +0000 (18:50 +0100)]
Fix a couple of warnings
Russell Belfer [Tue, 30 Oct 2012 16:40:50 +0000 (09:40 -0700)]
Move rename detection into new file
This improves the naming for the rename related functionality
moving it to be called `git_diff_find_similar()` and renaming
all the associated constants, etc. to make more sense.
I also moved the new code (plus the existing `git_diff_merge`)
into a new file `diff_tform.c` where I can put new functions
related to manipulating git diff lists.
This also updates the implementation significantly from the
last revision fixing some ordering issues (where break-rewrite
needs to be handled prior to copy and rename detection) and
improving config option handling.
Edward Thomson [Tue, 30 Oct 2012 01:04:21 +0000 (20:04 -0500)]
index refactoring
Ben Straub [Mon, 29 Oct 2012 20:34:14 +0000 (13:34 -0700)]
Fetch: don't clobber received count
This memset was being reached after the entire packfile under
WinHttp, so the byte count was being lost for small repos.
Vicent Martí [Mon, 29 Oct 2012 20:24:08 +0000 (13:24 -0700)]
Merge pull request #1027 from PaulThompson/cmake-flags-clean
Cmake flags clean
Vicent Martí [Mon, 29 Oct 2012 19:57:04 +0000 (12:57 -0700)]
Merge pull request #796 from nulltoken/topic/git-stash
Stash
Paul Thompson [Sat, 27 Oct 2012 23:21:28 +0000 (10:21 +1100)]
Leave CMAKE_BUILD_TYPE absent on those generators which don't use it.
Paul Thompson [Sat, 27 Oct 2012 22:56:18 +0000 (09:56 +1100)]
Removed overwrite of CMAKE_C_FLAGS_DEBUG.
- No overwriting allows control from cmake cache or cmdline
- -g is already the CMake default
- -O0 is already gcc's default
Paul Thompson [Sat, 27 Oct 2012 22:42:54 +0000 (09:42 +1100)]
Remove "-O2 -g" from default CMAKE_C_FLAGS.
- Those are the RelWithDebInfo flags.
- They should be controlled from CMAKE_BUILD_TYPE
Paul Thompson [Sat, 27 Oct 2012 22:25:43 +0000 (09:25 +1100)]
Remove duplicate CMAKE_C_FLAGS inside CMAKE_C_FLAGS_DEBUG.
- For Debug builds, CMake uses concatenated
CMAKE_C_FLAGS and CMAKE_C_FLAGS_DEBUG
- This reverts commit
291f7122927d2cc170dc63c378a08fa78515d987 .
nulltoken [Sat, 27 Oct 2012 07:30:03 +0000 (09:30 +0200)]
repo: enhance git_repository_state() detection
nulltoken [Fri, 26 Oct 2012 20:09:28 +0000 (22:09 +0200)]
tests: fix a memory leak
Ben Straub [Fri, 26 Oct 2012 20:43:13 +0000 (13:43 -0700)]
Add network transfer callbacks on Windows
nulltoken [Mon, 8 Oct 2012 18:07:55 +0000 (20:07 +0200)]
stash: add git_stash_drop()
nulltoken [Thu, 4 Oct 2012 13:13:43 +0000 (15:13 +0200)]
stash: add git_stash_foreach()
nulltoken [Thu, 4 Oct 2012 11:47:45 +0000 (13:47 +0200)]
stash: add git_stash_save()
nulltoken [Mon, 8 Oct 2012 13:49:31 +0000 (15:49 +0200)]
error: add GITERR_STASH error type
nulltoken [Fri, 29 Jun 2012 20:59:58 +0000 (22:59 +0200)]
refs: add GIT_REFS_STASH_FILE define
nulltoken [Wed, 3 Oct 2012 10:09:17 +0000 (12:09 +0200)]
index: introduce git_index_owner()
nulltoken [Tue, 9 Oct 2012 16:29:26 +0000 (18:29 +0200)]
reflog: fix bogus removal of reflog entries
nulltoken [Wed, 3 Oct 2012 13:12:42 +0000 (15:12 +0200)]
reflog: create reflog and its directory structure
nulltoken [Wed, 3 Oct 2012 11:56:13 +0000 (13:56 +0200)]
reflog: Make git_reflog_free() accept null param
nulltoken [Mon, 8 Oct 2012 14:23:15 +0000 (16:23 +0200)]
reflog: fix documentation typos
nulltoken [Wed, 3 Oct 2012 13:04:59 +0000 (15:04 +0200)]
message: reorganize tests
Vicent Martí [Thu, 25 Oct 2012 20:17:08 +0000 (13:17 -0700)]
Merge pull request #1021 from ethomson/cmake_vs
remove /ZM1000 from msvc builds
Edward Thomson [Thu, 25 Oct 2012 19:51:08 +0000 (14:51 -0500)]
remove /ZM1000 from msvc builds
Russell Belfer [Thu, 25 Oct 2012 18:48:39 +0000 (11:48 -0700)]
Add git_diff_patch_print
This adds a `git_diff_patch_print()` API which is more like the
existing API to "print" a patch from an entire `git_diff_list`
but operates on a single `git_diff_patch` object.
Also, it rewrites the `git_diff_patch_to_str()` API to use that
function (making it very small).
Russell Belfer [Thu, 25 Oct 2012 18:12:56 +0000 (11:12 -0700)]
Check errors while generating diff patch string
Russell Belfer [Thu, 25 Oct 2012 17:55:03 +0000 (10:55 -0700)]
Merge pull request #925 from nulltoken/topic/moving-branch-updates-config
Updates config upon moving and deletion of branches