]>
git.proxmox.com Git - libgit2.git/log
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)
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
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
Vicent Marti [Thu, 25 Oct 2012 17:22:35 +0000 (19:22 +0200)]
config: Only dereference value on success
Ben Straub [Thu, 25 Oct 2012 16:59:49 +0000 (09:59 -0700)]
Remove inline hint
Ben Straub [Thu, 25 Oct 2012 16:02:55 +0000 (09:02 -0700)]
Fix Windows build
Pedantic ordering of GIT_UNUSED vs. variable declarations.
nulltoken [Sun, 9 Sep 2012 18:39:13 +0000 (20:39 +0200)]
remote: introduce git_remote_rename()
nulltoken [Mon, 1 Oct 2012 09:58:15 +0000 (11:58 +0200)]
buf: introduce git_buf_splice()
nulltoken [Tue, 2 Oct 2012 12:36:59 +0000 (14:36 +0200)]
refspec: introduce git_refspec__serialize()
nulltoken [Mon, 17 Sep 2012 15:46:58 +0000 (17:46 +0200)]
remote: remove some code duplication
nulltoken [Mon, 17 Sep 2012 12:22:18 +0000 (14:22 +0200)]
remote: prevent from saving a nameless remote
nulltoken [Tue, 11 Sep 2012 16:11:26 +0000 (18:11 +0200)]
config: introduce git_config_rename_section()
nulltoken [Fri, 7 Sep 2012 15:55:30 +0000 (17:55 +0200)]
branch: rename config section upon moving
nulltoken [Fri, 7 Sep 2012 13:13:11 +0000 (15:13 +0200)]
branch: remove config section upon deletion
Vicent Martí [Thu, 25 Oct 2012 15:16:13 +0000 (08:16 -0700)]
Merge pull request #990 from ben/clone-callbacks
Progress callbacks
Russell Belfer [Thu, 25 Oct 2012 03:56:32 +0000 (20:56 -0700)]
Add git_diff_patch_to_str API
This adds an API to generate a complete single-file patch text
from a git_diff_patch object.
Vicent Martí [Thu, 25 Oct 2012 01:33:02 +0000 (18:33 -0700)]
Merge pull request #1013 from ethomson/reset_merge
reset changes for merge
Edward Thomson [Tue, 23 Oct 2012 21:32:01 +0000 (16:32 -0500)]
GIT_EUNMERGED
Edward Thomson [Tue, 23 Oct 2012 20:42:09 +0000 (15:42 -0500)]
reset changes for merge
Ben Straub [Wed, 24 Oct 2012 21:07:07 +0000 (14:07 -0700)]
Remove 'bytes' param from git_remote_download
Ben Straub [Wed, 24 Oct 2012 20:43:23 +0000 (13:43 -0700)]
Renaming: fix example
Ben Straub [Wed, 24 Oct 2012 20:29:14 +0000 (13:29 -0700)]
Network progress: rename things
git_indexer_stats and friends -> git_transfer_progress*
Also made git_transfer_progress members more sanely
named.
Ben Straub [Wed, 24 Oct 2012 19:38:05 +0000 (12:38 -0700)]
Fix documentation comment
Michael Schubert [Wed, 24 Oct 2012 13:42:09 +0000 (15:42 +0200)]
tests-clar/repo: remove unused variable
Ignacio Casal Quinteiro [Wed, 24 Oct 2012 09:27:03 +0000 (11:27 +0200)]
Fix example in comment
Scott J. Goldman [Wed, 24 Oct 2012 01:18:19 +0000 (18:18 -0700)]
Fix Makefile.embed to build src/sha1/*.c
Vicent Martí [Tue, 23 Oct 2012 20:43:28 +0000 (13:43 -0700)]
Merge pull request #1012 from carlosmn/libcrypto-sha
Use libcrypto's SHA-1 implementation when linking to it
Carlos Martín Nieto [Tue, 23 Oct 2012 17:30:04 +0000 (19:30 +0200)]
Use libcrypto's SHA-1 implementation when linking to it
libcryto's SHA-1 implementation is measurably better than the one that
ships with the library. If we link to it for HTTPS support already,
use that implementation instead.
Testing on a ~600MB of the linux repository, this reduces indexing
time by 40% and removes the hashing from the top spot in the perf
output.
Russell Belfer [Tue, 23 Oct 2012 16:53:15 +0000 (09:53 -0700)]
Merge pull request #923 from yorah/topic/config-store
Add git_config_level support when handling config files
Ben Straub [Tue, 23 Oct 2012 16:21:32 +0000 (09:21 -0700)]
Update doc strings, warn about callback perf
yorah [Mon, 10 Sep 2012 10:11:02 +0000 (12:11 +0200)]
Add config level support in the config API
Added `struct git_config_entry`: a git_config_entry contains the key, the value, and the config file level from which a config element was found.
Added `git_config_open_level`: build a single-level focused config object from a multi-level one.
We are now storing `git_config_entry`s in the khash of the config_file
yorah [Tue, 18 Sep 2012 12:10:40 +0000 (14:10 +0200)]
Fix adding variable to config file with no trailing newline
This can occur after a manual modification of a config file.
Vicent Martí [Mon, 22 Oct 2012 19:04:48 +0000 (12:04 -0700)]
Merge pull request #963 from carlosmn/remote-save-autotag
Save the autotag configuration for remotes
Vicent Martí [Mon, 22 Oct 2012 17:51:43 +0000 (10:51 -0700)]
Merge pull request #1004 from nulltoken/error/GIT_EORPHANEDHEAD
More orphaned head love
nulltoken [Sat, 20 Oct 2012 17:23:04 +0000 (19:23 +0200)]
tests: more git_repository_head_detached() coverage
nulltoken [Sat, 20 Oct 2012 10:09:02 +0000 (12:09 +0200)]
reset: make git_reset() cope with an orphaned HEAD
Vicent Martí [Mon, 22 Oct 2012 17:39:40 +0000 (10:39 -0700)]
Merge pull request #1008 from nulltoken/fix/chunked_blob
blob: do not create temp files in the current path
nulltoken [Mon, 22 Oct 2012 13:08:09 +0000 (15:08 +0200)]
blob: do not create temp files in the current path
- make sure temporary streamed blobs are created under the
.git/objects folder and not in the current path, whatever it is.
- do not make the name of the temp file depend on the hintpath.
nulltoken [Sat, 20 Oct 2012 10:07:53 +0000 (12:07 +0200)]
test: extract make_head_orphaned() logic
nulltoken [Sat, 20 Oct 2012 08:44:01 +0000 (10:44 +0200)]
tests: leverage git_repository_detach_head()
Ben Straub [Sat, 20 Oct 2012 03:24:15 +0000 (20:24 -0700)]
Improve clone sample's formatting
Ben Straub [Sat, 20 Oct 2012 03:05:18 +0000 (20:05 -0700)]
Checkout progress now reports completed/total steps
Ben Straub [Sat, 20 Oct 2012 02:37:47 +0000 (19:37 -0700)]
Fix from rebase
Ben Straub [Sat, 20 Oct 2012 02:33:23 +0000 (19:33 -0700)]
Remove third stage from checkout progress reporting
Also, now only reporting checkout progress for files that
are actually being added or removed.
Ben Straub [Sat, 20 Oct 2012 02:23:32 +0000 (19:23 -0700)]
gitno_buffer: callback on each packet
The fetch code takes advantage of this to implement a
progress callback every 100kb of transfer.
Ben Straub [Thu, 18 Oct 2012 22:35:03 +0000 (15:35 -0700)]
Fix broken tests
Ben Straub [Thu, 18 Oct 2012 22:28:09 +0000 (15:28 -0700)]
Indexing progress now goes to 100%
Ben Straub [Thu, 18 Oct 2012 22:17:12 +0000 (15:17 -0700)]
Correct progress reporting from checkout
Ben Straub [Thu, 18 Oct 2012 21:04:14 +0000 (14:04 -0700)]
Adjust for rebase
Ben Straub [Thu, 18 Oct 2012 19:57:47 +0000 (12:57 -0700)]
Clone: in-line callbacks for progress
Also implemented in the git2 example.
Ben Straub [Thu, 18 Oct 2012 16:57:19 +0000 (09:57 -0700)]
Fix clone.c's indentation
Ben Straub [Wed, 17 Oct 2012 21:06:32 +0000 (14:06 -0700)]
Fix example compilation
Ben Straub [Wed, 17 Oct 2012 21:02:24 +0000 (14:02 -0700)]
Fetch/indexer: progress callbacks
nulltoken [Wed, 17 Oct 2012 13:30:22 +0000 (15:30 +0200)]
index: remove read_tree() progress indicator
git_index_read_tree() was exposing a parameter to provide the user with
a progress indicator. Unfortunately, due to the recursive nature of the
tree walk, the maximum number of items to process was unknown. Thus,
the indicator was only counting processed entries, without providing
any information how the number of remaining items.
Ben Straub [Wed, 17 Oct 2012 17:15:51 +0000 (10:15 -0700)]
Example: compile fixes (not yet working)
Ben Straub [Wed, 17 Oct 2012 17:15:07 +0000 (10:15 -0700)]
Remove dead code