|
e226861e
|
2012-11-23T11:33:32
|
|
Merge pull request #1100 from martinwoodward/fuckityfuck
Remove use of English expletives
|
|
826bc4a8
|
2012-11-23T13:31:22
|
|
Remove use of English expletives
Remove words such as fuck, crap, shit etc.
Remove other potentially offensive words from comments.
Tidy up other geopolicital terms in comments.
|
|
5cf1b4f0
|
2012-11-22T11:16:35
|
|
Call git_remote_update_tips before git_remote_disconnect
|
|
|
5d4cdb04
|
2012-11-22T08:10:35
|
|
Merge pull request #1095 from martinwoodward/authors
Update to Authors
|
|
54be4d57
|
2012-11-20T15:02:06
|
|
Merge pull request #1092 from arrbee/legal-to-not-have-gitconfig
It is okay to not have a .gitconfig file
|
|
|
38f7d026
|
2012-11-20T14:50:36
|
|
Need to clear ignored error from config load
|
|
|
f0ebf82e
|
2012-11-20T11:34:12
|
|
Merge pull request #1089 from edubart/fix_win32_lstat
Fix win32 lstat
|
|
|
cc6b4162
|
2012-11-20T10:24:18
|
|
It is okay to not have a .gitconfig file
Opening a repo is generating an error if you don't have a
.gitconfig file in your home directory, but that should be
legal.
|
|
cf0dadcf
|
2012-11-20T01:19:31
|
|
Minor optimization in win32 do_lstat
|
|
|
e566b609
|
2012-11-20T00:57:56
|
|
Update clar tests p_lstat_posixly and p_lstat
|
|
|
2d96fce2
|
2012-11-19T23:12:20
|
|
update win32 lstat comment
|
|
|
52ead787
|
2012-11-19T22:30:20
|
|
Fix win32 lstat
|
|
|
a9069f61
|
2012-11-19T12:11:01
|
|
Merge pull request #1086 from scunz/vs_warning_level
VS-Build: Append C_FLAGS to the end of the already given ones.
|
|
4a03913c
|
2012-11-19T04:48:40
|
|
VS-Build: Disable /W4 parameter, as it is not picked up anyway
My other PR revealed, that the /W4 parameter, we give to MSVC is ignored
because cmake set CMAKE_C_FLAGS already to /W3 and we overwrite it.
The command line tools gave me a D9025 warning for this on every file and
looking into the project properties page on MSVC 2008 tells, that it has
the warning level set to /W3.
However, the warnings introduced by /W4 are far to useless for having
them enabled. So just disable them.
|
|
|
7a1282f6
|
2012-11-19T11:53:04
|
|
Merge pull request #1085 from scunz/no_pch_for_nmake
Don't use precompiled headers for command-line based VC builds.
|
|
|
26d9e317
|
2012-11-19T04:40:58
|
|
Don't use precompiled headers for command-line based VC builds.
The reason, why libgit2 currently cannot support compiling via the command-line
tools cl/nmake from WinSDK and/or Microsoft Visual Studio, seems to be a
missing dependency on the generated precompiled header file.
The Visual Studio IDE automatically inserts this dependency when it sees the
right combination of "/Y" parameters.
This patch allows to compile using command line tools by disabling precompiled
headers for NON-IDE builds.
|
|
560cc1e1
|
2012-11-18T17:19:20
|
|
Merge pull request #1084 from libgit2/filename-validation
Filename validation
|
|
1876360f
|
2012-11-18T16:59:42
|
|
Add a test for invalid filenames while writing tree from index
|
|
|
0d778b1a
|
2012-11-18T16:52:04
|
|
Catch invalid filenames in append_entry()
This prevents the index api from calling write_tree() with a
bogus tree.
|
|
|
19af78bb
|
2012-11-18T15:15:24
|
|
Prevent creating `..`, `.`, and `.git` with tree builder
As per core git.
|
|
|
629c0829
|
2012-11-18T14:15:04
|
|
Merge pull request #1082 from scunz/fixDoubleDeleteOnError
Indexer: Avoid a possible double-deletion in error case
|
|
|
4cc7342e
|
2012-11-18T09:07:35
|
|
Indexer: Avoid a possible double-deletion in error case
|
|
0066955d
|
2012-11-18T04:27:49
|
|
Fix a couple of warnings
|
|
0e9ea5d0
|
2012-11-17T18:42:40
|
|
Merge pull request #1077 from nulltoken/fix/api
Itsy bitsy tiny winy minor api related fixes
|
|
|
b15df1d9
|
2012-11-17T18:29:51
|
|
reflog: make entry_byindex() and drop() git compliant
Passing 0 as the index now retrieves the most recent entry instead
of the oldest one.
|
|
|
1a764476
|
2012-11-17T18:24:10
|
|
reflog: Fix documentation
|
|
|
270160b9
|
2012-11-17T13:39:24
|
|
config: Opening a nonexistent file returns ENOTFOUND
|
|
|
d36451c9
|
2012-11-17T12:34:15
|
|
config: Make git_config_file__ondisk() internal
|
|
|
6091457e
|
2012-11-17T07:19:14
|
|
repo: ensure is_empty() checks there are no refs
|
|
|
f5a0e734
|
2012-11-17T06:46:42
|
|
tests: introduce cl_git_remove_placeholders()
|
|
|
5df7207a
|
2012-11-17T06:56:19
|
|
repo: readonly tests don't need a sandboxed repo
|
|
|
0e95e70a
|
2012-11-17T05:22:39
|
|
env: ensure git_futils_find_xxx() returns ENOTFOUND
|
|
|
aa8a76ef
|
2012-11-17T05:12:14
|
|
tag: rename git_tag_type to git_tag_target_type
|
|
|
86b9dbc1
|
2012-11-17T04:50:48
|
|
Fix MSVC compilation warnings
|
|
|
e087973e
|
2012-11-16T10:27:46
|
|
Merge pull request #1075 from carlosmn/alternates-recurse
odb: recursively load alternates
|
|
85e7efa1
|
2012-11-14T13:35:43
|
|
odb: recursively load alternates
The maximum depth is 5, like in git
|
|
|
0cd063fd
|
2012-11-15T23:28:52
|
|
Merge pull request #1071 from arrbee/alternate-fix-strcmp
Win32 fixes for diff/checkout/reset
|
|
|
96acc0b6
|
2012-11-16T02:30:00
|
|
AUTHORS: cleanup
|
|
|
0ec11828
|
2012-11-16T02:17:57
|
|
Fix -Wmaybe-uninitialized warning
|
|
414bd936
|
2012-11-15T16:20:02
|
|
Include Microsoft in AUTHORS
|
|
|
4a0c7f56
|
2012-11-15T10:31:11
|
|
Merge pull request #1074 from edubart/ignore_diff_filemode
Add option to ignore file mode in diffs
|
|
|
63f7c6f4
|
2012-11-15T10:18:25
|
|
Merge pull request #1072 from arrbee/diff-api-signatures
Diff API signatures
|
|
|
c0d5acf6
|
2012-11-15T14:43:21
|
|
Add option to ignore file mode in diffs
|
|
|
bbe6dbec
|
2012-11-14T23:29:48
|
|
Add explicit git_index ptr to diff and checkout
A number of diff APIs and the `git_checkout_index` API take a
`git_repository` object an operate on the index. This updates
them to take a `git_index` pointer explicitly and only fall back
on the `git_repository` index if the index input is NULL. This
makes it easier to operate on a temporary index.
|
|
|
bad68c0a
|
2012-11-13T14:02:59
|
|
Add iterator for git_index object
The index iterator could previously only be created from a repo
object, but this allows creating an iterator from a `git_index`
object instead (while keeping, though renaming, the old function).
|
|
|
5735bf5e
|
2012-11-13T13:58:29
|
|
Fix diff API to better parameter order
The diff API is not in the parameter order one would expect from
other libgit2 APIs. This fixes that.
|
|
|
402b92cf
|
2012-11-14T22:44:17
|
|
Fix reset hard tests on platforms with CRLF
The reset hard tests had hardcoded expected file content and was
not correctly compensating for CRLF filtering when a file needed
to be reverted by the reset hard. This fixes that.
|
|
|
cccacac5
|
2012-11-14T22:41:51
|
|
Add POSIX compat lstat() variant for win32
The existing p_lstat implementation on win32 is not quite POSIX
compliant when setting errno to ENOTDIR. This adds an option to
make is be compliant so that code (such as checkout) that cares
to have separate behavior for ENOTDIR can use it portably.
This also contains a couple of other minor cleanups in the
posix_w32.c implementations to avoid unnecessary work.
|
|
|
a277345e
|
2012-11-14T22:37:13
|
|
Create internal strcmp variants for function ptrs
Using the builtin strcmp and strcasecmp as function pointers is
problematic on win32. This adds internal implementations and
divorces us from the platform linkage.
|
|
|
5a36f127
|
2012-11-13T21:14:52
|
|
Merge pull request #1069 from carlosmn/readme
Explain a few CMake options in the README
|
|
|
66bf4dbc
|
2012-11-13T16:57:37
|
|
Explain a few CMake options in the README
Expose STDCALL and explain a few useful CMake options, as well as
explain the quirks building on Windows.
|
|
|
7e9f5e65
|
2012-11-13T20:06:15
|
|
Slightly different valgrind fix
Allocate with calloc rather than conditionally memsetting a specific
part of the struct later on.
|
|
|
6132a54e
|
2012-11-13T16:13:10
|
|
Fix a few valgrind errors
|
|
|
513e794e
|
2012-11-13T14:59:18
|
|
Merge pull request #1068 from carlosmn/config-empty-value
Deal with empty and nonexsitent values in config
|
|
|
0da81d2b
|
2012-11-13T14:43:23
|
|
config: return an emtpy string when there is no value
Returning NULL for the string when we haven't signaled an error
condition is counter-intuitive and causes unnecessary edge
cases. Return an empty string when asking for a string value for a
configuration variable such as '[section] var' to avoid these edge
cases.
If the distinction between no value and an empty value is needed, this
can be retrieved from the entry directly. As a side-effect, this
change stops the int parsing functions from segfaulting on such a
variable.
|
|
f6c18dda
|
2012-11-13T14:17:41
|
|
http: Unrustle
|
|
|
aa1c3b58
|
2012-11-13T14:13:47
|
|
Merge pull request #1016 from arrbee/fix-checkout-dir-removal
Update checkout with new strategies & behavior
|
|
|
26227474
|
2012-11-13T14:05:43
|
|
makefile: Fix the builtin Makefile
|
|
|
47db054d
|
2012-11-13T13:41:01
|
|
config: distinguish between a lone variable name and one without rhs
'[section] variable' and '[section] variable =' behave differently
when parsed as booleans, so we need to store that distinction
internally.
|
|
|
3ee078c0
|
2012-11-13T13:46:17
|
|
config: rename get_config_entry -> config_entry
We're already in the git_config namespace, there is no need to repeat
it.
|
|
|
3741a37f
|
2012-11-13T13:28:08
|
|
Merge pull request #1055 from ethomson/sha1_win32
Win32 CryptoAPI and CNG support for SHA1
|
|
|
70572ff8
|
2012-11-13T13:26:04
|
|
Merge pull request #1064 from libgit2/http-parser-2
Bump the builtin http-parser to v2.0
|
|
|
2a612fe3
|
2012-11-13T14:57:35
|
|
filebuf now has a git_hash_ctx instead of a ctx*
|
|
|
a8527429
|
2012-11-13T14:48:10
|
|
unload dll / destroy hash ctxs at shutdown
|
|
|
7ebefd22
|
2012-11-13T10:10:40
|
|
move hash library func ptrs to global global
|
|
|
603bee07
|
2012-11-12T19:22:49
|
|
Remove git_hash_ctx_new - callers now _ctx_init()
|
|
d6fb0924
|
2012-11-05T12:37:15
|
|
Win32 CryptoAPI and CNG support for SHA1
|
|
|
e45423dd
|
2012-11-13T05:45:08
|
|
Merge pull request #1065 from nulltoken/fix/memory-leak
Fix memory leaks
|
|
|
d51e54f1
|
2012-11-13T14:28:44
|
|
Remove unused variables
|
|
|
4e547eee
|
2012-11-13T07:11:24
|
|
test: fix memory leak
|
|
|
3dee3655
|
2012-11-13T07:04:30
|
|
local: fix memory leak
|
|
|
64ac9548
|
2012-11-12T15:42:03
|
|
Bump the builtin http-parser
|
|
|
9a50026b
|
2012-11-12T15:38:28
|
|
clar-helpers: Oops, grab pointer
|
|
|
19c044a1
|
2012-11-12T14:23:17
|
|
Merge remote-tracking branch 'ben/local-transport' into development
|
|
|
3b44ced0
|
2012-11-12T14:12:41
|
|
Merge pull request #1061 from nulltoken/topic/explicit-head-errors
repository: Refine repository_head() error report
|
|
|
14157652
|
2012-11-12T07:57:03
|
|
Remove unnecessary progress logic
The indexer handles this better than the fetch
logic does.
|
|
|
0f5520f7
|
2012-11-12T07:55:09
|
|
Fix error check
|
|
|
b1a3a70e
|
2012-11-12T00:14:51
|
|
repository: Refine repository_head() error report
|
|
|
ef887151
|
2012-11-11T23:52:37
|
|
Fix compilation warning
|
|
|
e090a568
|
2012-11-11T10:01:11
|
|
Merge pull request #1010 from ethomson/fetch_head
create FETCH_HEAD specially instead of as a ref file
|
|
|
b0f6e45d
|
2012-11-01T15:47:18
|
|
create FETCH_HEAD specially instead of as a ref file
|
|
|
d18713fb
|
2012-11-10T20:24:53
|
|
Merge pull request #1056 from nulltoken/duplicate-tree-entries
Duplicate tree entries
|
|
|
29c16698
|
2012-11-10T20:24:23
|
|
Merge pull request #1060 from nulltoken/topic/explicit-index-errors
Topic/explicit index errors
|
|
|
95d73de1
|
2012-11-10T21:10:49
|
|
index: prefer INDEX_OWNER usage
|
|
|
33f95a9b
|
2012-11-10T21:01:05
|
|
index: refine add_from_workdir() error report
|
|
|
69c068c7
|
2012-11-10T20:42:45
|
|
index: make git_index_new() work with a NULL path
|
|
|
353e9916
|
2012-11-10T16:43:05
|
|
tests: Add missing assertions
|
|
|
2ff1a0d0
|
2012-11-09T16:59:46
|
|
Helpers for local-filesystem remote URLs
|
|
|
757b4065
|
2012-11-09T14:01:44
|
|
Fix warnings and valgrind issues
This fixes some various warnings that showed up in Travis and
a couple uses of uninitialized memory and one memory leak.
|
|
|
0f3def71
|
2012-11-09T11:19:46
|
|
Fix various cross-platform build issues
This fixes a number of warnings and problems with cross-platform
builds. Among other things, it's not safe to name a member of a
structure "strcmp" because that may be #defined.
|
|
|
8064ecba
|
2012-11-09T10:48:25
|
|
Update reset hard test
The `git_reset` API with the HARD option is still slightly
broken, but this test now does exercise the ability of the
command to revert modified files.
|
|
|
a1bf70e4
|
2012-11-08T21:58:24
|
|
fix regression in diff with submodule oid
|
|
|
ad9a921b
|
2012-11-08T17:05:07
|
|
Rework checkout with new strategy options
This is a major reworking of checkout strategy options. The
checkout code is now sensitive to the contents of the HEAD tree
and the new options allow you to update the working tree so that
it will match the index content only when it previously matched
the contents of the HEAD. This allows you to, for example, to
distinguish between removing files that are in the HEAD but not
in the index, vs just removing all untracked files.
Because of various corner cases that arise, etc., this required
some additional capabilities in rmdir and other utility functions.
This includes the beginnings of an implementation of code to read
a partial tree into the index based on a pathspec, but that is
not enabled because of the possibility of creating conflicting
index entries.
|
|
|
55cbd05b
|
2012-11-08T16:56:34
|
|
Some diff refactorings to help code reuse
There are some diff functions that are useful in a rewritten
checkout and this lays some groundwork for that. This contains
three main things:
1. Share the function diff uses to calculate the OID for a file
in the working directory (now named `git_diff__oid_for_file`
2. Add a `git_diff__paired_foreach` function to iterator over
two diff lists concurrently. Convert status to use it.
3. Move all the string/prefix/index entry comparisons into
function pointers inside the `git_diff_list` object so they
can be switched between case sensitive and insensitive
versions. This makes them easier to reuse in various
functions without replicating logic. As part of this, move
a couple of index functions out of diff.c and into index.c.
|
|
|
2e3d4b96
|
2012-11-08T16:47:28
|
|
Move pathspec code in separate files
Diff uses a `git_strarray` of path specs to represent a subset
of all files to be processed. It is useful to be able to reuse
this filtering in other places outside diff, so I've moved it
into a standalone set of utilities.
|
|
|
220d5a6c
|
2012-11-08T16:45:25
|
|
Make iterator ignore eval lazy
This makes it so that the check if a file is ignored will be
deferred until requested on the workdir iterator, instead of
aggressively evaluating the ignore rules for each entry. This
should improve performance because there will be no need to
check ignore rules for files that are already in the index.
|
|
|
18eff2ad
|
2012-11-08T16:44:39
|
|
Clean up a couple things missed in rebase
|
|
|
32def5af
|
2012-10-24T17:37:07
|
|
Fix checkout behavior when its hands are tied
So, @nulltoken created a failing test case for checkout that
proved to be particularly daunting. If checkout is given only
a very limited strategy mask (e.g. just GIT_CHECKOUT_CREATE_MISSING)
then it is possible for typechange/rename modifications to leave it
unable to complete the request. That's okay, but the existing code
did not have enough information not to generate an error (at least
for tree/blob conflicts).
This led me to a significant reorganization of the code to handle
the failing case, but it has three benefits:
1. The test case is handled correctly (I think)
2. The new code should actually be much faster than the old code
since I decided to make checkout aware of diff list internals.
3. The progress value accuracy is hugely increased since I added
a fourth pass which calculates exactly what work needs to be
done before doing anything.
|
|
|
331e7de9
|
2012-10-24T17:32:50
|
|
Extensions to rmdir and mkdir utilities
* Rework GIT_DIRREMOVAL values to GIT_RMDIR flags, allowing
combinations of flags
* Add GIT_RMDIR_EMPTY_PARENTS flag to remove parent dirs that
are left empty after removal
* Add GIT_MKDIR_VERIFY_DIR to give an error if item is a file,
not a dir (previously an EEXISTS error was ignored, even for
files) and enable this flag for git_futils_mkpath2file call
* Improve accuracy of error messages from git_futils_mkdir
|
|
|
8a328cf4
|
2012-11-09T13:19:32
|
|
Merge pull request #1058 from pwkelley/development
Fixes for two segfaults
|