Commit Graph

8472 Commits

Author SHA1 Message Date
Edward Thomson
e74340b000 checkout: remove files before writing new ones
On case insensitive filesystems, we may have files in the working
directory that case fold to a name we want to write.  Remove those
files (by default) so that we will not end up with a filename that
has the unexpected case.
2015-01-20 17:13:31 -06:00
Edward Thomson
c2dee0fcb0 checkout: drop newline in error message 2015-01-20 17:13:20 -06:00
Edward Thomson
232bc89598 checkout tests: nasty symlinks
Symbolic links that abuse case insensitivity to write into .git.
2015-01-20 17:13:09 -06:00
Edward Thomson
b4cbd67f5f checkout: don't recreate previous directory
Don't bother trying to recreate the previously created directory
during checkout, for a modest reduction in the number of stats.
2015-01-20 17:12:58 -06:00
Edward Thomson
fe598f0903 mkdir: walk up tree to mkdir
Walk up the tree to mkdir, which is less immediately efficient,
but allows us to look at intermediate directories that may need
attention.
2015-01-20 17:12:46 -06:00
Edward Thomson
1fbfcdfcd0 git_path_join_unrooted: return base len
The documentation for `git_path_join_unrooted` states that the base
length will be returned, so that consumers like checkout know where
to start creating directories instead of always creating directories
at the directory root.
2015-01-20 17:12:35 -06:00
Edward Thomson
1d50b3649d checkout: introduce git_checkout_perfdata
Checkout can now provide performance data about the number of (some)
syscalls performed using an optional callback.
2015-01-20 17:12:23 -06:00
Edward Thomson
93b4a50de1 Merge pull request #2704 2015-01-20 16:19:55 -06:00
Linquize
b4c6a9da93 Add files and tests with many UTF-8 chars and few UTF-8 chars 2015-01-20 16:17:48 -06:00
Sven Strickroth
0161e096a3 Make binary detection work similar to vanilla git
Main change: Don't treat chars > 128 as non-printable (common in UTF-8 files)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-01-20 16:17:37 -06:00
Jacques Germishuys
9ae4ad2daf Treat a NULL string as if it's empty 2015-01-20 23:26:55 +02:00
Jacques Germishuys
526182d28c Remove logically dead code (we're already asserting) 2015-01-20 23:24:32 +02:00
Carlos Martín Nieto
2136240dbd Merge pull request #2828 from ethomson/treediff_dont_patch
diff: only compute patches when requested
2015-01-20 20:13:34 +01:00
Edward Thomson
147d86fc69 diff: only compute patches when requested
When we're called with no hunk or line callback, we don't need to
do the hunk or line computation.
2015-01-20 12:31:24 -06:00
Edward Thomson
7cfbf3b770 README: Point to libgit2 account's AppVeyor badge
Microsoft is sponsoring a Pro account at AppVeyor for the libgit2
and LibGit2Sharp projects.  Point to that account's badge.
2015-01-16 21:21:03 +00:00
Carlos Martín Nieto
d5712ed2b3 Merge pull request #2821 from maksqwe/strlen_optimization
Remove strlen() calls from loop condition
2015-01-15 14:57:37 +01:00
Maks Naumov
d8b5c8c329 Remove strlen() calls from loop condition
Avoid str length recalculation every iteration
2015-01-15 15:16:19 +02:00
Carlos Martín Nieto
eac773d92b config: add parsing and getter for paths 2015-01-14 19:36:50 +01:00
Edward Thomson
4d6f55acce CHANGELOG: include small file similarity detection 2015-01-14 10:26:26 -06:00
Edward Thomson
a93acf9169 Merge pull request #2818 from leoyanggit/openssl_option
Add option to turn off OpenSSL
2015-01-14 10:23:38 -06:00
Edward Thomson
85880693d5 Merge branch 'pr/2740' 2015-01-14 10:19:28 -06:00
Pierre-Olivier Latour
b3837d4d2b Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for merges
git_merge_tree_flag_t cannot contain any GIT_DIFF_FIND_xxx flags so there's not point in checking for them
2015-01-14 10:18:00 -06:00
Pierre-Olivier Latour
36fc549781 Added GIT_HASHSIG_ALLOW_SMALL_FILES to allow computing signatures for small files
The implementation of the hashsig API disallows computing a signature on
small files containing only a few lines. This new flag disables this
behavior.

git_diff_find_similar() sets this flag by default which means that rename
/ copy detection of small files will now work. This in turn affects the
behavior of the git_status and git_blame APIs which will now detect rename
of small files assuming the right options are passed.
2015-01-14 10:17:56 -06:00
Leo Yang
7641327c8b Add option to turn off OpenSSL 2015-01-13 16:53:07 -05:00
nulltoken
e6911dff9d Merge pull request #2817 from PeterDaveHello/patch-1
Use svg instead of png to get better image quality
2015-01-13 20:35:08 +01:00
Carlos Martín Nieto
16bcf0c79c Pre-fill the changelog with the subheadings 2015-01-13 19:29:00 +01:00
Peter Dave Hello
c5c8ece1d6 Use svg instead of png to get better image quality 2015-01-14 02:14:38 +08:00
Carlos Martín Nieto
04bdd97f2b Merge pull request #2815 from ethomson/example
clone example: don't divide by zero
2015-01-12 08:59:46 +01:00
Edward Thomson
9af3c4169c clone example: don't divide by zero
Local transports don't have data about the size, avoid dividing by
zero in the callback.
2015-01-10 18:24:27 +00:00
Carlos Martín Nieto
b91f28be7d Reformat the changelog
This should provide a easier way to see what kinds of changes we have,
and a single place to look at the breaking changes.
2015-01-10 00:49:20 +01:00
Carlos Martín Nieto
d4b2410126 Merge commit '4b1018d24f980273528743c27c47ceb96cb720bd'
Fix crash in free() when git_buf_grow() fails.
2015-01-09 16:47:48 +01:00
Jeff Hostetler
4b1018d24f Fix crash in free() when git_buf_grow() fails. 2015-01-09 16:46:44 +01:00
Carlos Martín Nieto
fe8399fe9b Fix warning 2015-01-09 16:29:08 +01:00
Carlos Martín Nieto
788c5f1ca8 Merge pull request #2810 from ethomson/remove_symlinks
Remove symlinks from the repository
2015-01-09 10:23:08 +01:00
Edward Thomson
aebdbcd954 Merge pull request #2811 from ethomson/remote_leak
remote: plug leak
2015-01-08 17:27:58 -06:00
Edward Thomson
365d367238 submodule::init tests: free some leaks 2015-01-08 22:31:15 +00:00
Edward Thomson
a8846da7b3 remote: plug leak 2015-01-08 13:45:22 -06:00
Edward Thomson
3b40ed897f repo::init test: create hook symlink
Remove the hook symlink from the test resources, so that we can
have a source tree that is easy to zip up and copy around on systems
that don't support symlinks.  Create it dynamically at test execution
instead.
2015-01-08 19:23:37 +00:00
Edward Thomson
1646412d8f Merge pull request #2802 from calavera/remote_create_prune_config
Load prune configuration when a remote is created.
2015-01-08 11:20:44 -06:00
David Calavera
de4a75f977 Fix more indentation. 2015-01-07 09:26:36 -08:00
David Calavera
c868981f0e Add extern function to initialize submodule update options. 2015-01-07 09:04:49 -06:00
Carlos Martín Nieto
6a6c24e016 Merge pull request #2806 from ethomson/changelog
CHANGELOG: we've added git_describe
2015-01-07 11:54:08 +00:00
Edward Thomson
2ce37794d0 Merge pull request #2805 from ethomson/msvc
submodule: declare vars at top of func block
2015-01-06 18:34:55 -06:00
Edward Thomson
9b22f8b414 Merge pull request #2803 from ethomson/appveyor
Add appveyor yaml
2015-01-06 18:34:43 -06:00
Edward Thomson
61cd037e0b CHANGELOG: we've added git_describe 2015-01-06 17:18:57 -06:00
Edward Thomson
388ca7e73c Add appveyor yaml 2015-01-06 17:10:50 -06:00
Edward Thomson
5018e2c639 submodule: declare vars at top of func block 2015-01-06 17:08:38 -06:00
Carlos Martín Nieto
007f3ff6fa Merge pull request #2801 from ethomson/changelog
CHANGELOG: add missing 0.22 changes
2015-01-05 21:34:26 +00:00
David Calavera
66b71ea5f5 Fix intentation. 2015-01-05 13:33:36 -08:00
Edward Thomson
974d21c899 CHANGELOG: add missing 0.22 changes 2015-01-05 15:28:55 -06:00