Carlos Martín Nieto
ceb5873913
Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-path
...
List a submodule only once when the path matches a submodule in the index
2015-07-13 18:50:39 +02:00
Carlos Martín Nieto
f861abadfe
Merge branch 'portable-zu'
2015-07-12 19:56:19 +02:00
Matthew Plough
768f8be31c
Fix #3094 - improve use of portable size_t/ssize_t format specifiers.
...
The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
2015-07-12 19:55:19 +02:00
Carlos Martín Nieto
a34c4f8dce
submdule: reproduce double-reporting of a submodule in foreach
...
When we rename a submodule, we should be merging two sets of information
based on whether their path is the same. We currently only deduplicate
on equal name, which causes us to double-report.
2015-07-11 13:32:57 +02:00
Edward Thomson
9a99ca7b21
wildcard filters: move CHANGELOG message to 0.23+1
2015-07-10 09:53:30 -05:00
Edward Thomson
bae467aec4
wildcard filters: clean up some warnings in tests
2015-07-10 09:53:29 -05:00
Carlos Martín Nieto
9847d80ddc
Merge pull request #3281 from ethomson/wildcard_filters
...
filters: custom filters with wildcard attributes
2015-07-09 18:21:31 +02:00
Edward Thomson
43ce8cb52e
revert: correct test that added trailing newline
2015-07-07 17:01:49 -05:00
Edward Thomson
ae8f7260ec
merge_files: don't add trailing newlines
...
When invoked with three files that each lack a trailing newline,
the merge result should also lack a trailing newline.
2015-07-07 17:01:48 -05:00
Carlos Martín Nieto
3704ac35d3
Merge pull request #3277 from git-up/git_diff_index_to_index
...
Added git_diff_index_to_index()
2015-07-07 12:38:47 +02:00
Carlos Martín Nieto
ea445e0602
Merge pull request #3288 from ethomson/getenv
...
git__getenv: utf-8 aware env reader
2015-07-07 00:48:17 +02:00
Carlos Martín Nieto
3c831113ca
Merge pull request #3202 from jeffhostetler/windows_stack_trace
...
Stacktraces with CRTDBG memory leaks on Windows
2015-07-06 19:04:48 +02:00
Edward Thomson
e069c621bd
git__getenv: utf-8 aware env reader
...
Introduce `git__getenv` which is a UTF-8 aware `getenv` everywhere.
Make `cl_getenv` use this to keep consistent memory handling around
return values (free everywhere, as opposed to only some platforms).
2015-07-02 16:35:43 +00:00
Carlos Martín Nieto
f034c8518e
Merge pull request #3287 from ethomson/filter_test_cleanup
...
filter::stream: free the filter sanely
2015-07-02 17:55:16 +02:00
Edward Thomson
79306d8d59
filter::stream: free the filter sanely
...
Don't use the filter's free callback to free the actual data structure
holding the filter, as we may not always actually initialize it (the
test may be skipped).
2015-07-02 10:21:48 -05:00
Carlos Martín Nieto
e8e848a8da
submodule: add failing test for loading the wrong submodule
...
When two submodules are fairly similar, we may end up loading the wrong
one.
2015-07-01 21:14:55 +02:00
Carlos Martín Nieto
34065968ed
submodule: completely remove reload_all
...
The function was removed, but its declaration and changelog entry about
its removal were forgotten.
The comment in the test doesn't make any sense as the function doesn't
exist anymore, so get rid of it as well.
2015-07-01 17:49:07 +02:00
Edward Thomson
63924435a1
filters: custom filters with wildcard attributes
...
Allow custom filters with wildcard attributes, so that clients
can support some random `filter=foo` in a .gitattributes and look
up the corresponding smudge/clean commands in the configuration file.
2015-07-01 09:40:11 -05:00
Pierre-Olivier Latour
ccef5adb63
Added git_diff_index_to_index()
2015-06-30 10:03:32 -07:00
Edward Thomson
eb29292aed
index tests: add eol to avoid compiler warning
2015-06-30 14:31:07 +00:00
Edward Thomson
504b069701
checkout test: mark unused vars
2015-06-30 14:31:07 +00:00
Carlos Martín Nieto
7bfdd1c2d2
Merge pull request #3270 from ethomson/warnings2
...
Remove some warnings
2015-06-30 10:21:06 +02:00
Edward Thomson
64c415c2ae
checkout test: check getcwd return value
2015-06-29 22:34:00 +00:00
Edward Thomson
eadf37151b
clar: test chdir
2015-06-29 22:13:40 +00:00
Edward Thomson
d88abb8949
filter test: pass base type
2015-06-29 22:13:40 +00:00
Edward Thomson
0175971e91
stash: const up conflict params
2015-06-29 21:23:09 +00:00
Edward Thomson
2cf33fee89
index test: include repository.h for decl
2015-06-29 21:23:09 +00:00
Jeff Hostetler
93b4272895
Include stacktrace summary in memory leak output.
2015-06-29 16:39:11 -04:00
Carlos Martín Nieto
c28a5c972d
submodule: remove trailing slashes from submodule paths
...
We allow looking up a submodule by path, but we lost the path
normalisation during the recent changes. Bring it back.
2015-06-29 21:10:47 +02:00
Carlos Martín Nieto
fa399750c6
Merge pull request #3265 from libgit2/leaks
...
Plug a bunch of leaks
2015-06-27 21:26:27 +02:00
Carlos Martín Nieto
92ec9ed328
Merge pull request #3260 from ethomson/apply_with_reflog_indices
...
stash: test we apply using reflog-like indices
2015-06-27 21:15:00 +02:00
Carlos Martín Nieto
24fa21f38e
index, iterator, fetchhead: plug leaks
2015-06-26 19:00:33 +02:00
Carlos Martín Nieto
afd8a94ee7
checkout: plug a few leaks
2015-06-26 18:49:39 +02:00
Carlos Martín Nieto
9568660f62
diff: fix leaks in diff printing
2015-06-26 18:31:39 +02:00
Carlos Martín Nieto
cfafeb843d
Merge pull request #3263 from git-up/fixes
...
Fixes
2015-06-26 18:11:05 +02:00
Edward Thomson
ee6eed5188
stash: test we apply using reflog-like indices
2015-06-26 11:48:48 -04:00
Carlos Martín Nieto
354268ca48
Merge pull request #3259 from ethomson/stash_apply_argh
...
Stash apply: stage new files even when not updating the index
2015-06-26 17:46:35 +02:00
Pierre-Olivier Latour
492851c9a2
Removed unused variables
2015-06-26 08:18:06 -07:00
Vicent Marti
13e5e344a6
test-diff-blob: Pass proper nibble sizes
2015-06-26 16:52:26 +02:00
Vicent Marti
a2f8d1ae2b
revparse: Add test to make sure this doesn't regress
2015-06-26 16:48:58 +02:00
Edward Thomson
619423f238
diff: test we don't update index unnecessarily
...
Test that workdir diffs, when presented with UPDATE_INDEX, only
write the index when they actually make a change.
2015-06-26 02:00:20 -04:00
Edward Thomson
c0280bdd15
Merge pull request #3255 from libgit2/cmn/rename-unspecified
...
Rename FALLBACK to UNSPECIFIED
2015-06-25 18:55:48 -04:00
Edward Thomson
b7f5cb8dd7
stash: stage new files when unstashing them
...
Files that were new (staged additions) in the stash tree should
be staged when unstashing, even when not applying the index.
2015-06-25 18:34:38 -04:00
Edward Thomson
82b1c93d08
stash: don't allow apply with staged changes
2015-06-25 18:34:36 -04:00
Edward Thomson
1db6a0ab52
stash apply: add a newly staged file to tests
2015-06-25 18:33:56 -04:00
Edward Thomson
3b66c6a397
Merge pull request #3256 from libgit2/cmn/fetch-spec-fetchhead
...
remote: insert refspecs with no rhs in FETCH_HEAD
2015-06-25 15:36:53 -04:00
Edward Thomson
87987fd1e0
Merge pull request #3246 from libgit2/cmn/dont-grow-borrowed
...
Don't allow growing borrowed buffers
2015-06-25 15:26:43 -04:00
Carlos Martín Nieto
23aa7c9037
remote: insert refspecs with no rhs in FETCH_HEAD
...
When a refspec contains no rhs and thus won't cause an explicit update,
we skip all the logic, but that means that we don't update FETCH_HEAD
with it, which is what the implicit rhs is.
Add another bit of logic which puts those remote heads in the list of
updates so we put them into FETCH_HEAD.
2015-06-25 13:40:38 +02:00
Carlos Martín Nieto
c2418f4613
Rename FALLBACK to UNSPECIFIED
...
Fallback describes the mechanism, while unspecified explains what the
user is thinking.
2015-06-25 12:48:44 +02:00
Carlos Martín Nieto
a65992355d
buffer: make use of EINVALID for growing a borrowed buffer
...
This explains more closely what happens. While here, set an error
message.
2015-06-24 23:49:10 +02:00
