Carlos Martín Nieto
0798b01400
ignore: add failing test for a file mentioning the parent
...
When we mention "src" in src/.gitignore, we wrongly consider src/ itself
to be ignored.
2014-11-06 10:10:26 +01:00
Edward Thomson
b4e5432ff0
Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-cr
...
ignore: consider files with a CR in their names
2014-11-05 10:47:19 -05:00
Carlos Martín Nieto
5c54e2162a
ignore: consider files with a CR in their names
...
We currently consider CR to start the end of the line, but that means
that we miss cases with CR CR LF which can be used with git to match
files whose names have CR at the end of their names.
The fix from the patch comes from Russell's comment in the issue.
This fixes #2536 .
2014-11-05 16:22:01 +01:00
Carlos Martín Nieto
3f8d005a82
Merge pull request #2686 from ethomson/rename_notfound
...
Propogate GIT_ENOTFOUND from git_remote_rename
2014-11-03 22:27:11 +01:00
Edward Thomson
cce27d8242
git_remote_rename: propogate GIT_ENOTFOUND
2014-11-03 14:10:31 -05:00
Edward Thomson
de0c4555da
Merge pull request #2679 from jfultz/missing-include
...
Make config reading continue after hitting a missing include file.
2014-11-03 11:32:47 -05:00
Edward Thomson
0a62918188
Merge pull request #2661 from swisspol/2656
...
Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
2014-11-03 15:10:14 +01:00
Edward Thomson
4bb8708730
Merge pull request #2683 from libgit2/cmn/remote-unify
...
remote: unify the creation code
2014-11-03 15:01:41 +01:00
Edward Thomson
873eb899e4
Merge pull request #2680 from libgit2/cmn/invalid-cert-return
...
netops: return GIT_ECERTIFICATE when it fails the basic tests
2014-11-03 14:57:39 +01:00
Edward Thomson
0fab748e91
Merge pull request #2685 from libgit2/cmn/mmap-readable
...
Fix segmentation fault observed on OpenBSD/sparc64
2014-11-03 14:52:34 +01:00
Edward Thomson
2cc6011e69
Merge pull request #2684 from jacquesg/openssl-windows
...
Make the Visual Studio compiler happy
2014-11-03 14:49:56 +01:00
Stefan Sperling
aad0bd6bc7
Fix segmentation fault observed on OpenBSD/sparc64
...
A non-readable mapping of a file causes an access violation in
the pack tests. Always use PROT_READ to work around this.
2014-11-03 13:49:04 +01:00
Jacques Germishuys
bc48bcdcb3
Make the Visual Studio compiler happy
2014-11-03 14:23:13 +02:00
John Fultz
ebc13b2b7c
Clean up issues include.path issues found during code review.
...
* Error-handling is cleaned up to only let a file-not-found error
through, not other sorts of errors. And when a file-not-found
error happens, we clean up the error.
* Test now checks that file-not-found introduces no error. And
other minor cleanups.
2014-11-02 19:16:49 -06:00
Carlos Martín Nieto
a68e217f5c
remote: unify the creation code
...
The create function with default refspec is the same as the one with a
custom refspec, but it has the default refspec, so we can create the one
on top of the other.
2014-11-02 21:58:39 +01:00
Carlos Martín Nieto
ea8dedc953
remote: fix tagopt test
...
An anonymous remote wouldn't create remote-tracking branches, so testing
we don't create them for TAGS_ALL is nonsensical. Furthermore, the name
of the supposed remote-tracking branch was also not one which would have
been created had it had a name.
Give the remote a name and test that we only create the tags when we
pass TAGS_ALL and that we do create the remote-branch branch when given
TAGS_AUTO.
2014-11-02 20:39:29 +01:00
Carlos Martín Nieto
521c0cab7a
merge: talk about the merging state after git_merge()
...
Since it's not necessarily obvious, mention the merging state and how to
clear it.
2014-11-02 17:18:19 +01:00
Carlos Martín Nieto
22fbb2656e
netops: return GIT_ECERTIFICATE when it fails the basic tests
...
When we first ask OpenSSL to verify the certfiicate itself (rather
than the HTTPS specifics), we should also return
GIT_ECERTIFICATE. Otherwise, the caller would consider this as a failed
operation rather than a failed validation and not call the user's own
validation.
2014-11-02 16:12:10 +01:00
John Fultz
727ae380a5
Make config reading continue after hitting a missing include file.
...
For example, if you have
[include]
path = foo
and foo didn't exist, git_config_open_ondisk() would just give up
on the rest of the file. Now it ignores the unresolved include
without error and continues reading the rest of the file.
2014-11-01 11:21:45 -05:00
Edward Thomson
264d74fd40
Merge pull request #2669 from ethomson/revert_test_fix
...
revert tests: always use core.autocrlf=false in tests
2014-10-27 15:04:21 -07:00
Edward Thomson
53ca45ee25
revert tests: always use core.autocrlf=false in tests
2014-10-27 17:27:25 -04:00
Edward Thomson
7647f4495d
Merge pull request #2659 from swisspol/static_analysis
...
Fixed the most obvious Clang static analyzer warnings
2014-10-27 12:19:42 -07:00
Pierre-Olivier Latour
64bcf567c3
Fixed potential crash with uninitialized variables
2014-10-27 09:19:07 -07:00
Pierre-Olivier Latour
ea66215d87
Removed some useless variable assignments
2014-10-27 09:19:07 -07:00
Pierre-Olivier Latour
d88766c4e1
Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
2014-10-27 09:17:01 -07:00
Edward Thomson
116a19d467
Merge pull request #2666 from libgit2/cmn/threadsafe-on
...
Flip THREADSAFE's default to ON
2014-10-27 06:33:11 -07:00
Carlos Martín Nieto
177a29d832
Merge commit 'refs/pull/2366/head' of github.com:libgit2/libgit2
2014-10-27 10:39:45 +01:00
Carlos Martín Nieto
79b0ae4e24
Flip THREADSAFE's default to ON
...
Threads are here to stay; and for a while now, users have had to call
the initialization function which sets up threads and crypto regardless
of whether the library was built threadsafe or not.
2014-10-27 10:30:57 +01:00
Edward Thomson
aabe1e5a44
Merge branch 'csware/cleanup'
2014-10-26 23:36:15 -04:00
Sven Strickroth
334a0696f9
Minor cleanup: Use defined no_check_cert_flags instead of C&P them again
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2014-10-26 23:23:08 -04:00
Edward Thomson
b07db1eb76
Merge pull request #2482 from libgit2/ed/rebase
...
Rebase (merge)
2014-10-26 20:18:04 -07:00
Edward Thomson
679172812c
rebase: add information to the CHANGELOG
2014-10-26 22:59:53 -04:00
Edward Thomson
979645a719
rebase: updates based on PR comments
2014-10-26 22:59:50 -04:00
Edward Thomson
18b00406c6
s/git_merge_head/git_annotated_commit
...
Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.
2014-10-26 22:59:48 -04:00
Edward Thomson
796b03bd49
rebase: clean up some warnings and memory leaks
2014-10-26 22:59:46 -04:00
Edward Thomson
e69737d760
rebase: oid member of operation should be const
2014-10-26 22:59:43 -04:00
Edward Thomson
ed2c06a6a1
git_rebase: iterators for operations
2014-10-26 22:59:41 -04:00
Edward Thomson
f152f8ac0c
rebase: preload all operations
2014-10-26 22:59:38 -04:00
Edward Thomson
b6b636a7fa
rebase: init/open a git_rebase object
2014-10-26 22:59:36 -04:00
Edward Thomson
18b439b9be
git_rebase_next: provide info about the operation
2014-10-26 22:59:34 -04:00
Edward Thomson
5ae9d296e3
git_rebase_finish: rewrite notes when finishing rebase
2014-10-26 22:59:32 -04:00
Edward Thomson
bad4937ea5
Introduce git_note_author, git_note_committer
2014-10-26 22:59:29 -04:00
Edward Thomson
a612a25fa6
git_rebase_commit: write HEAD's reflog appropriately
2014-10-26 22:59:27 -04:00
Edward Thomson
517644cce4
Introduce git_rebase_finish to complete a rebase
2014-10-26 22:59:25 -04:00
Edward Thomson
14864fbfeb
git_rebase_next: test that we return GIT_ITEROVER
2014-10-26 22:59:23 -04:00
Edward Thomson
93a7004cc2
git_rebase_commit: drop already-picked commits
...
Already cherry-picked commits should not be re-included. If all changes
included in a commit exist in the upstream, then we should error with
GIT_EAPPLIED.
2014-10-26 22:59:21 -04:00
Edward Thomson
a35a9890b0
Introduce git_rebase_commit
...
Commit the current patch of a rebase process.
2014-10-26 22:59:19 -04:00
Edward Thomson
443d5674fe
git_rebase_next: write conflicts nicely during rebase
2014-10-26 22:59:16 -04:00
Edward Thomson
950a709159
Introduce git_rebase_next
...
`git_rebase_next` will apply the next patch (or cherry-pick)
operation, leaving the results checked out in the index / working
directory so that consumers can resolve any conflicts, as appropriate.
2014-10-26 22:59:14 -04:00
Edward Thomson
4fe84d624b
Introduce git_rebase_abort
...
Abort an in-progress rebase and move the working directory and
repository back to the ORIG_HEAD state.
2014-10-26 22:59:12 -04:00
