]> git.proxmox.com Git - libgit2.git/log
libgit2.git
11 years agorepo: fix state when HEAD is not detached
Keith Dahlby [Sun, 4 Nov 2012 18:13:42 +0000 (12:13 -0600)]
repo: fix state when HEAD is not detached

11 years agoMerge pull request #1042 from pwkelley/progress_cb
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

11 years agoFix 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

11 years agoMove error capture to top of giterr_set
Russell Belfer [Fri, 2 Nov 2012 17:42:20 +0000 (10:42 -0700)]
Move error capture to top of giterr_set

11 years agoMerge pull request #1014 from arrbee/diff-rename-detection
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

11 years agoMerge pull request #1040 from ethomson/index_refactor
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

11 years agoMerge pull request #1041 from pwkelley/transports
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

11 years agoPrefer 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

11 years agofreeing index entries would be helpful
Edward Thomson [Fri, 2 Nov 2012 06:01:21 +0000 (01:01 -0500)]
freeing index entries would be helpful

11 years agoLEAAAVE ME ALOOOONEEE
Vicent Marti [Thu, 1 Nov 2012 22:01:24 +0000 (23:01 +0100)]
LEAAAVE ME ALOOOONEEE

11 years agoMerge pull request #1038 from arrbee/doc-fixes
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

11 years agoMerge pull request #1037 from libgit2/index-open-cleanup
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

11 years agoImprove docs, examples, warnings
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.

11 years agoindex: Add `git_index_new`
Vicent Marti [Thu, 1 Nov 2012 19:28:28 +0000 (20:28 +0100)]
index: Add `git_index_new`

11 years agoindex: Fix tests
Vicent Marti [Thu, 1 Nov 2012 19:24:43 +0000 (20:24 +0100)]
index: Fix tests

11 years agoindex: Add git_index_write_tree
Vicent Marti [Thu, 1 Nov 2012 19:15:53 +0000 (20:15 +0100)]
index: Add git_index_write_tree

11 years agoindex: Switch to git_futils_filestamp
Vicent Marti [Wed, 31 Oct 2012 21:26:57 +0000 (22:26 +0100)]
index: Switch to git_futils_filestamp

11 years agoHide deprecations on MacOS
Russell Belfer [Thu, 1 Nov 2012 17:57:14 +0000 (10:57 -0700)]
Hide deprecations on MacOS

Why Apple, why?

11 years agoMerge pull request #1036 from jamill/text_stat
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

11 years agoUpdate 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.

11 years agoMerge pull request #1030 from pwkelley/transports
Vicent Martí [Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)]
Merge pull request #1030 from pwkelley/transports

Reorganize transport architecture

11 years agoHttp: Set an error for invalid content-type
Philip Kelley [Thu, 1 Nov 2012 16:07:42 +0000 (12:07 -0400)]
Http: Set an error for invalid content-type

11 years agoFix a bug in cl_setenv on Windows XP
Philip Kelley [Thu, 1 Nov 2012 15:50:08 +0000 (11:50 -0400)]
Fix a bug in cl_setenv on Windows XP

11 years agoImprove consistency of WinHTTP request headers
Philip Kelley [Thu, 1 Nov 2012 14:29:30 +0000 (10:29 -0400)]
Improve consistency of WinHTTP request headers

11 years agoReorganize transport architecture (squashed 3)
Philip Kelley [Mon, 29 Oct 2012 17:41:14 +0000 (13:41 -0400)]
Reorganize transport architecture (squashed 3)

11 years agoMerge branch 'config-refresh' into development
Vicent Marti [Wed, 31 Oct 2012 19:52:16 +0000 (20:52 +0100)]
Merge branch 'config-refresh' into development

11 years agoI LIKE THESE NAMES
Vicent Marti [Wed, 31 Oct 2012 19:52:01 +0000 (20:52 +0100)]
I LIKE THESE NAMES

11 years agoBetter naming for file timestamp/size checker
Russell Belfer [Wed, 31 Oct 2012 18:26:12 +0000 (11:26 -0700)]
Better naming for file timestamp/size checker

11 years agoCheckout: remove duplicate 100% progress report
Ben Straub [Wed, 31 Oct 2012 17:14:13 +0000 (10:14 -0700)]
Checkout: remove duplicate 100% progress report

11 years agoEnsure that non-error is not propagated
Ben Straub [Wed, 31 Oct 2012 17:13:57 +0000 (10:13 -0700)]
Ensure that non-error is not propagated

11 years agoAdd git_config_refresh() API to reload config
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.

11 years agoMerge pull request #1017 from arrbee/diff-patch-to-str
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

11 years agoMerge pull request #1026 from nulltoken/repo/state
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

11 years agoMerge pull request #1029 from ethomson/index_refactor
Vicent Martí [Tue, 30 Oct 2012 18:51:58 +0000 (11:51 -0700)]
Merge pull request #1029 from ethomson/index_refactor

Index changes

11 years agoFix a couple of warnings
Michael Schubert [Tue, 30 Oct 2012 17:50:59 +0000 (18:50 +0100)]
Fix a couple of warnings

11 years agoMove rename detection into new file
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.

11 years agoindex refactoring
Edward Thomson [Tue, 30 Oct 2012 01:04:21 +0000 (20:04 -0500)]
index refactoring

11 years agoFetch: don't clobber received count
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.

11 years agoMerge pull request #1027 from PaulThompson/cmake-flags-clean
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

11 years agoMerge pull request #796 from nulltoken/topic/git-stash
Vicent Martí [Mon, 29 Oct 2012 19:57:04 +0000 (12:57 -0700)]
Merge pull request #796 from nulltoken/topic/git-stash

Stash

11 years agoLeave CMAKE_BUILD_TYPE absent on those generators which don't use it.
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.

11 years agoRemoved overwrite of CMAKE_C_FLAGS_DEBUG.
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

11 years agoRemove "-O2 -g" from default CMAKE_C_FLAGS.
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

11 years agoRemove duplicate CMAKE_C_FLAGS inside CMAKE_C_FLAGS_DEBUG.
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.

11 years agorepo: enhance git_repository_state() detection
nulltoken [Sat, 27 Oct 2012 07:30:03 +0000 (09:30 +0200)]
repo: enhance git_repository_state() detection

11 years agotests: fix a memory leak
nulltoken [Fri, 26 Oct 2012 20:09:28 +0000 (22:09 +0200)]
tests: fix a memory leak

11 years agoAdd network transfer callbacks on Windows
Ben Straub [Fri, 26 Oct 2012 20:43:13 +0000 (13:43 -0700)]
Add network transfer callbacks on Windows

11 years agostash: add git_stash_drop()
nulltoken [Mon, 8 Oct 2012 18:07:55 +0000 (20:07 +0200)]
stash: add git_stash_drop()

11 years agostash: add git_stash_foreach()
nulltoken [Thu, 4 Oct 2012 13:13:43 +0000 (15:13 +0200)]
stash: add git_stash_foreach()

11 years agostash: add git_stash_save()
nulltoken [Thu, 4 Oct 2012 11:47:45 +0000 (13:47 +0200)]
stash: add git_stash_save()

11 years agoerror: add GITERR_STASH error type
nulltoken [Mon, 8 Oct 2012 13:49:31 +0000 (15:49 +0200)]
error: add GITERR_STASH error type

11 years agorefs: add GIT_REFS_STASH_FILE define
nulltoken [Fri, 29 Jun 2012 20:59:58 +0000 (22:59 +0200)]
refs: add GIT_REFS_STASH_FILE define

11 years agoindex: introduce git_index_owner()
nulltoken [Wed, 3 Oct 2012 10:09:17 +0000 (12:09 +0200)]
index: introduce git_index_owner()

11 years agoreflog: fix bogus removal of reflog entries
nulltoken [Tue, 9 Oct 2012 16:29:26 +0000 (18:29 +0200)]
reflog: fix bogus removal of reflog entries

11 years agoreflog: create reflog and its directory structure
nulltoken [Wed, 3 Oct 2012 13:12:42 +0000 (15:12 +0200)]
reflog: create reflog and its directory structure

11 years agoreflog: Make git_reflog_free() accept null param
nulltoken [Wed, 3 Oct 2012 11:56:13 +0000 (13:56 +0200)]
reflog: Make git_reflog_free() accept null param

11 years agoreflog: fix documentation typos
nulltoken [Mon, 8 Oct 2012 14:23:15 +0000 (16:23 +0200)]
reflog: fix documentation typos

11 years agomessage: reorganize tests
nulltoken [Wed, 3 Oct 2012 13:04:59 +0000 (15:04 +0200)]
message: reorganize tests

11 years agoMerge pull request #1021 from ethomson/cmake_vs
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

11 years agoremove /ZM1000 from msvc builds
Edward Thomson [Thu, 25 Oct 2012 19:51:08 +0000 (14:51 -0500)]
remove /ZM1000 from msvc builds

11 years agoAdd git_diff_patch_print
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).

11 years agoCheck errors while generating diff patch string
Russell Belfer [Thu, 25 Oct 2012 18:12:56 +0000 (11:12 -0700)]
Check errors while generating diff patch string

11 years agoMerge pull request #925 from nulltoken/topic/moving-branch-updates-config
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

11 years agoconfig: Only dereference value on success
Vicent Marti [Thu, 25 Oct 2012 17:22:35 +0000 (19:22 +0200)]
config: Only dereference value on success

11 years agoRemove inline hint
Ben Straub [Thu, 25 Oct 2012 16:59:49 +0000 (09:59 -0700)]
Remove inline hint

11 years agoFix Windows build
Ben Straub [Thu, 25 Oct 2012 16:02:55 +0000 (09:02 -0700)]
Fix Windows build

Pedantic ordering of GIT_UNUSED vs. variable declarations.

11 years agoremote: introduce git_remote_rename()
nulltoken [Sun, 9 Sep 2012 18:39:13 +0000 (20:39 +0200)]
remote: introduce git_remote_rename()

11 years agobuf: introduce git_buf_splice()
nulltoken [Mon, 1 Oct 2012 09:58:15 +0000 (11:58 +0200)]
buf: introduce git_buf_splice()

11 years agorefspec: introduce git_refspec__serialize()
nulltoken [Tue, 2 Oct 2012 12:36:59 +0000 (14:36 +0200)]
refspec: introduce git_refspec__serialize()

11 years agoremote: remove some code duplication
nulltoken [Mon, 17 Sep 2012 15:46:58 +0000 (17:46 +0200)]
remote: remove some code duplication

11 years agoremote: prevent from saving a nameless remote
nulltoken [Mon, 17 Sep 2012 12:22:18 +0000 (14:22 +0200)]
remote: prevent from saving a nameless remote

11 years agoconfig: introduce git_config_rename_section()
nulltoken [Tue, 11 Sep 2012 16:11:26 +0000 (18:11 +0200)]
config: introduce git_config_rename_section()

11 years agobranch: rename config section upon moving
nulltoken [Fri, 7 Sep 2012 15:55:30 +0000 (17:55 +0200)]
branch: rename config section upon moving

11 years agobranch: remove config section upon deletion
nulltoken [Fri, 7 Sep 2012 13:13:11 +0000 (15:13 +0200)]
branch: remove config section upon deletion

11 years agoMerge pull request #990 from ben/clone-callbacks
Vicent Martí [Thu, 25 Oct 2012 15:16:13 +0000 (08:16 -0700)]
Merge pull request #990 from ben/clone-callbacks

Progress callbacks

11 years agoAdd git_diff_patch_to_str API
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.

11 years agoMerge pull request #1013 from ethomson/reset_merge
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

11 years agoGIT_EUNMERGED
Edward Thomson [Tue, 23 Oct 2012 21:32:01 +0000 (16:32 -0500)]
GIT_EUNMERGED

11 years agoreset changes for merge
Edward Thomson [Tue, 23 Oct 2012 20:42:09 +0000 (15:42 -0500)]
reset changes for merge

11 years agoRemove 'bytes' param from git_remote_download
Ben Straub [Wed, 24 Oct 2012 21:07:07 +0000 (14:07 -0700)]
Remove 'bytes' param from git_remote_download

11 years agoRenaming: fix example
Ben Straub [Wed, 24 Oct 2012 20:43:23 +0000 (13:43 -0700)]
Renaming: fix example

11 years agoNetwork progress: rename things
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.

11 years agoFix documentation comment
Ben Straub [Wed, 24 Oct 2012 19:38:05 +0000 (12:38 -0700)]
Fix documentation comment

11 years agotests-clar/repo: remove unused variable
Michael Schubert [Wed, 24 Oct 2012 13:42:09 +0000 (15:42 +0200)]
tests-clar/repo: remove unused variable

11 years agoFix example in comment
Ignacio Casal Quinteiro [Wed, 24 Oct 2012 09:27:03 +0000 (11:27 +0200)]
Fix example in comment

11 years agoFix Makefile.embed to build src/sha1/*.c
Scott J. Goldman [Wed, 24 Oct 2012 01:18:19 +0000 (18:18 -0700)]
Fix Makefile.embed to build src/sha1/*.c

11 years agoInitial implementation of diff rename detection
Russell Belfer [Tue, 23 Oct 2012 23:40:51 +0000 (16:40 -0700)]
Initial implementation of diff rename detection

This implements the basis for diff rename and copy detection,
although it is based on simple SHA comparison right now instead
of using a matching algortihm.  Just as `git_diff_merge` can be
used as a post-pass on diffs to emulate certain command line
behaviors, there is a new API `git_diff_detect` which will
update a diff list in-place, adjusting some deltas to RENAMED
or COPIED state (and also, eventually, splitting MODIFIED deltas
where the change is too large into DELETED/ADDED pairs).

This also adds a new test repo that will hold rename/copy/split
scenarios.  Right now, it just has exact-match rename and copy,
but the tests are written to use tree diffs, so we should be able
to add new test scenarios easily without breaking tests.

11 years agoMerge pull request #1012 from carlosmn/libcrypto-sha
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

11 years agoUse 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.

11 years agoMerge pull request #923 from yorah/topic/config-store
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

11 years agoUpdate doc strings, warn about callback perf
Ben Straub [Tue, 23 Oct 2012 16:21:32 +0000 (09:21 -0700)]
Update doc strings, warn about callback perf

11 years agoAdd config level support in the config API
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

11 years agoFix adding variable to config file with no trailing newline
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.

11 years agoMerge pull request #963 from carlosmn/remote-save-autotag
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

11 years agoMerge pull request #1004 from nulltoken/error/GIT_EORPHANEDHEAD
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

11 years agotests: more git_repository_head_detached() coverage
nulltoken [Sat, 20 Oct 2012 17:23:04 +0000 (19:23 +0200)]
tests: more git_repository_head_detached() coverage

11 years agoreset: make git_reset() cope with an orphaned HEAD
nulltoken [Sat, 20 Oct 2012 10:09:02 +0000 (12:09 +0200)]
reset: make git_reset() cope with an orphaned HEAD

11 years agoMerge pull request #1008 from nulltoken/fix/chunked_blob
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

11 years agoblob: 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.

11 years agotest: extract make_head_orphaned() logic
nulltoken [Sat, 20 Oct 2012 10:07:53 +0000 (12:07 +0200)]
test: extract make_head_orphaned() logic