Ben Straub
a0ce87c51c
Add network transfer callbacks on Windows
2012-10-26 13:43:13 -07:00
nulltoken
e4c64cf2aa
stash: add git_stash_drop()
2012-10-26 22:11:15 +02:00
nulltoken
233884131d
stash: add git_stash_foreach()
2012-10-26 22:11:09 +02:00
nulltoken
590fb68be0
stash: add git_stash_save()
2012-10-26 22:10:48 +02:00
nulltoken
eb44cfe07b
error: add GITERR_STASH error type
2012-10-26 21:02:06 +02:00
nulltoken
4ea0a0ca05
refs: add GIT_REFS_STASH_FILE define
2012-10-26 21:02:05 +02:00
nulltoken
b1be9dd0e5
index: introduce git_index_owner()
2012-10-26 21:02:04 +02:00
nulltoken
1f87fa3595
reflog: fix bogus removal of reflog entries
2012-10-26 21:02:01 +02:00
nulltoken
27e3c58392
reflog: create reflog and its directory structure
2012-10-26 21:02:00 +02:00
nulltoken
d2aa6de722
reflog: Make git_reflog_free() accept null param
2012-10-26 21:02:00 +02:00
nulltoken
f7ae3f7531
reflog: fix documentation typos
2012-10-26 21:01:59 +02:00
nulltoken
65d12df525
message: reorganize tests
2012-10-26 21:01:58 +02:00
Vicent Martí
8bba3c95b8
Merge pull request #1021 from ethomson/cmake_vs
...
remove /ZM1000 from msvc builds
2012-10-25 13:17:08 -07:00
Edward Thomson
94155e2fa2
remove /ZM1000 from msvc builds
2012-10-25 14:51:08 -05:00
Russell Belfer
cb7180a6e2
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).
2012-10-25 11:48:39 -07:00
Russell Belfer
3943dc78a5
Check errors while generating diff patch string
2012-10-25 11:12:56 -07:00
Russell Belfer
1b9346897b
Merge pull request #925 from nulltoken/topic/moving-branch-updates-config
...
Updates config upon moving and deletion of branches
2012-10-25 10:55:03 -07:00
Vicent Marti
505f37b41a
config: Only dereference value on success
2012-10-25 19:22:35 +02:00
Ben Straub
67dad09bdb
Remove inline hint
2012-10-25 09:59:49 -07:00
Ben Straub
1fc375e6ef
Fix Windows build
...
Pedantic ordering of GIT_UNUSED vs. variable declarations.
2012-10-25 09:02:55 -07:00
nulltoken
fcccf3045f
remote: introduce git_remote_rename()
2012-10-25 17:42:36 +02:00
nulltoken
3a14d3e2bc
buf: introduce git_buf_splice()
2012-10-25 17:42:35 +02:00
nulltoken
fb39b3a54c
refspec: introduce git_refspec__serialize()
2012-10-25 17:42:34 +02:00
nulltoken
4fe5520a10
remote: remove some code duplication
2012-10-25 17:42:33 +02:00
nulltoken
e497b16c57
remote: prevent from saving a nameless remote
2012-10-25 17:42:33 +02:00
nulltoken
aba7078177
config: introduce git_config_rename_section()
2012-10-25 17:42:32 +02:00
nulltoken
383f164a09
branch: rename config section upon moving
2012-10-25 17:42:31 +02:00
nulltoken
0b98a8a424
branch: remove config section upon deletion
2012-10-25 17:42:31 +02:00
Vicent Martí
1eb8cd7f87
Merge pull request #990 from ben/clone-callbacks
...
Progress callbacks
2012-10-25 08:16:13 -07:00
Russell Belfer
93cf7bb8e2
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.
2012-10-24 20:56:32 -07:00
Vicent Martí
5edb846e03
Merge pull request #1013 from ethomson/reset_merge
...
reset changes for merge
2012-10-24 18:33:02 -07:00
Edward Thomson
03bdb2addd
GIT_EUNMERGED
2012-10-24 20:24:37 -05:00
Edward Thomson
632d8b230b
reset changes for merge
2012-10-24 20:24:37 -05:00
Ben Straub
1e3b8ed5cf
Remove 'bytes' param from git_remote_download
2012-10-24 14:07:07 -07:00
Ben Straub
9762ad993d
Renaming: fix example
2012-10-24 13:43:23 -07:00
Ben Straub
7d222e1312
Network progress: rename things
...
git_indexer_stats and friends -> git_transfer_progress*
Also made git_transfer_progress members more sanely
named.
2012-10-24 13:29:14 -07:00
Ben Straub
c4958e6818
Fix documentation comment
2012-10-24 12:38:05 -07:00
Michael Schubert
6f6b0c013c
tests-clar/repo: remove unused variable
2012-10-24 15:42:09 +02:00
Ignacio Casal Quinteiro
4bc252e4ec
Fix example in comment
2012-10-24 15:00:56 +02:00
Scott J. Goldman
308581de9e
Fix Makefile.embed to build src/sha1/*.c
2012-10-23 18:18:19 -07:00
Russell Belfer
b4f5bb0747
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.
2012-10-23 16:40:51 -07:00
Vicent Martí
81e7b10a15
Merge pull request #1012 from carlosmn/libcrypto-sha
...
Use libcrypto's SHA-1 implementation when linking to it
2012-10-23 13:43:28 -07:00
Carlos Martín Nieto
7205a4d94c
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.
2012-10-23 20:30:16 +02:00
Russell Belfer
5b67d145d8
Merge pull request #923 from yorah/topic/config-store
...
Add git_config_level support when handling config files
2012-10-23 09:53:15 -07:00
Ben Straub
c70ad945cd
Update doc strings, warn about callback perf
2012-10-23 09:23:44 -07:00
yorah
a1abe66aca
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
2012-10-23 12:48:38 +02:00
yorah
f8ede94808
Fix adding variable to config file with no trailing newline
...
This can occur after a manual modification of a config file.
2012-10-23 11:48:50 +02:00
Vicent Martí
8a89aa1f57
Merge pull request #963 from carlosmn/remote-save-autotag
...
Save the autotag configuration for remotes
2012-10-22 12:04:48 -07:00
Vicent Martí
40846f3d9a
Merge pull request #1004 from nulltoken/error/GIT_EORPHANEDHEAD
...
More orphaned head love
2012-10-22 10:51:43 -07:00
nulltoken
f36fb761dc
tests: more git_repository_head_detached() coverage
2012-10-22 19:46:00 +02:00