Vicent Martí
bb19532c5f
Merge pull request #1386 from arrbee/update-docs
...
Update contributing and conventions
2013-03-02 14:29:39 -08:00
Russell Belfer
a313de0d9e
Fixed a couple typos
2013-03-02 13:58:05 -08:00
Russell Belfer
7bd53bf385
Simplify diff example using revparse
...
When the examples/diff.c was written, there was not yet a revparse
API. Now we can use it to make command line parsing way better
with less code. Yay!
2013-03-02 13:52:38 -08:00
Russell Belfer
1631147c19
Updates to CONTRIBUTING and CONVENTIONS
...
The discussion about converting some of our foreach-style APIs to
use iterator objects got me wanting to make a list of good starter
projects. I put it in CONTRIBUTING.md and then went crazy with
updates to that file and to CONVENTIONS.md.
2013-03-02 13:51:31 -08:00
Vicent Martí
01be786319
Merge pull request #1382 from arrbee/fix-diff-patch-a-different-way
...
Allow empty config object and use it for tests
2013-03-01 14:28:47 -08:00
Russell Belfer
487fc724ff
Allow empty config object and use it
...
This removes assertions that prevent us from having an empty
git_config object and then updates some tests that were
dependent on global config state to use an empty config before
running anything.
2013-03-01 13:41:53 -08:00
Philip Kelley
47f70846aa
Merge pull request #1379 from arrbee/fix-tests-with-autocrlf-input-on-windows
...
Control for core.autocrlf during testing
2013-03-01 13:27:46 -08:00
Russell Belfer
7d46b34baf
Control for core.autocrlf during testing
2013-03-01 12:26:05 -08:00
Vicent Martí
426b2e2fce
Merge pull request #1378 from jamill/clone_no_delete
...
Clone should not clean up directories it did not create
2013-03-01 12:10:06 -08:00
Jameson Miller
926acbcf8e
Clone should not delete directories it did not create
2013-03-01 14:56:09 -05:00
Vicent Martí
cc427158d4
Merge pull request #1373 from arrbee/why-cdecl-why
...
Why cdecl why?
2013-02-28 15:09:32 -08:00
Russell Belfer
f443a72d33
Fix some deprecation warnings on Windows
...
This fixes some snprintf and vsnprintf related deprecation
warnings we've been having on Windows with recent compilers.
2013-02-28 14:41:26 -08:00
Russell Belfer
97b7137459
Add GIT_STDLIB_CALL
...
This removes the one-off GIT_CDECL and adds a new standard way of
doing this named GIT_STDLIB_CALL with a src/win32 specific def
when on the Windows platform.
2013-02-28 14:14:45 -08:00
Vicent Marti
5fa8abb868
w32-posix: Wrap the timezone declaration with a clause
...
Allows compilation in newer versions of MinGW that already defined it.
2013-02-28 17:36:20 +01:00
Russell Belfer
f708c89fa6
fixing some warnings on Windows
2013-02-27 15:15:39 -08:00
Russell Belfer
11b5beb7ba
use cdecl for hashsig sorting functions on Windows
2013-02-27 15:07:28 -08:00
Vicent Martí
e68e33f33d
Merge pull request #1233 from arrbee/file-similarity-metric
...
Add file similarity scoring to diff rename/copy detection
2013-02-27 14:50:32 -08:00
Russell Belfer
9f9477d650
Merge pull request #1372 from ethomson/checkout_workdir_end
...
don't dereference at the end of the workdir iterator
2013-02-27 14:21:41 -08:00
Edward Thomson
395509ffcd
don't dereference at the end of the workdir iterator
2013-02-27 15:35:52 -06:00
Vicent Martí
c493f8211f
Merge pull request #1371 from csware/version-constants
...
Win32: Use constants in version resource definitions where possible
2013-02-27 11:01:16 -08:00
Sven Strickroth
82ac1f7678
Win32: Use constants in version resource definitions where possible
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-02-27 19:48:02 +01:00
Vicent Martí
6990377786
Merge pull request #1368 from scunz/inc_ref
...
Increment reference counter in git_repository_set_config
2013-02-26 09:29:27 -08:00
Sascha Cunz
25e7c9b7a6
Increment reference counter in git_repository_set_config
...
This fixes #1365
2013-02-26 18:21:03 +01:00
Edward Thomson
3e212548f8
Merge pull request #1364 from martinwoodward/thank-martin
...
Give props to Martin Pool
2013-02-26 07:06:42 -08:00
Martin Woodward
5c46937b3a
Give props to Martin Pool
...
Martin Pool was the original author of the code referenced in the clone
example. Make note that he's given his permission and also give him the
proper credit.
2013-02-26 09:00:37 +00:00
Michael Schubert
8005c6d420
Revert "hash: remove git_hash_init from internal api"
...
This reverts commit efe7fad6c9 , except for
the indentation fixes.
2013-02-26 01:08:34 +01:00
Vicent Martí
f657688bc7
Merge pull request #1363 from schu/hash-initialization
...
hash: remove git_hash_init from internal api
2013-02-25 15:41:56 -08:00
Michael Schubert
efe7fad6c9
hash: remove git_hash_init from internal api
...
Along with that, fix indentation in tests-clar/object/raw/hash.c
2013-02-26 00:23:00 +01:00
Michael Schubert
be225be785
tests/pack: fixup 6774b10
...
Initialize the hash ctx with git_hash_ctx_init, not git_hash_init.
2013-02-25 23:36:25 +01:00
Vicent Martí
989abe9be4
Merge pull request #1362 from schu/packbuilder-nits
...
packbuilder: minor improvements
2013-02-25 14:03:42 -08:00
Michael Schubert
6774b1071f
tests/pack: do strict check of testpack's SHA1 hash
2013-02-25 22:22:15 +01:00
Michael Schubert
fcc265fef8
pack.h: improve docs on how to create a packfile
2013-02-25 22:22:15 +01:00
Vicent Martí
25a0831f2d
Merge pull request #1359 from martinwoodward/remove-sample-hooks
...
Remove sample hook files
2013-02-25 09:07:45 -08:00
Martin Woodward
fc6c5b5001
Remove sample hook files
...
Getting rid of sample hook files from test repos as they just take up
space with no value.
2013-02-25 17:03:05 +00:00
Vicent Martí
5eeb357df8
Merge pull request #1355 from phkelley/development
...
Portability fixes for Solaris
2013-02-23 03:39:11 -08:00
Vicent Martí
68fec637a2
Merge pull request #1356 from arrbee/fix-directory-as-ignore-file
...
Do not fail if .gitignore is directory
2013-02-22 12:26:01 -08:00
Russell Belfer
37d9168608
Do not fail if .gitignore is directory
...
This is designed to fix libgit2sharp #350 where if .gitignore is
a directory we abort all operations that process ignores instead
of just skipping it as core git does.
Also added test that fails without this change and passes with it.
2013-02-22 12:21:54 -08:00
Russell Belfer
1be4ba9842
More rename detection tests
...
This includes tests for crlf changes, whitespace changes with the
default comparison and with the ignore whitespace comparison, and
more sensitivity checking for the comparison code.
2013-02-22 11:13:01 -08:00
Philip Kelley
7beeb3f420
Rename 'exp' so it doesn't conflict with exp()
2013-02-22 14:03:44 -05:00
Russell Belfer
0a0089131f
Minor improvements to find_similar code
...
This moves a couple of checks outside of the inner loop of the
find_similar rename/copy detection phase that are only dependent
on the "from" side of a detection.
Also, this replaces the inefficient initialization of the
options structure when a value is not provided explicitly by the
user.
2013-02-22 10:21:02 -08:00
Russell Belfer
f827589067
Replace static data with configured metric
...
Instead of creating three git_diff_similarity_metric statically
for the various config options, just create the metric structure
on demand and populate it, using the payload to specific the
extra flags that should be passed to the hashsig. This removes
a level of obfuscation from the code, I think.
2013-02-22 10:19:50 -08:00
Russell Belfer
6f9d5ce818
Fix tests for find_similar and related
...
This fixes both a test that I broke in diff::patch where I was
relying on the current state of the working directory for the
renames test data and fixes an unstable test in diff::rename
where the environment setting for the "diff.renames" config was
being allowed to influence the test results.
2013-02-22 10:17:08 -08:00
Vicent Martí
06eaa06f26
Merge pull request #1343 from nulltoken/topic/remote_orphaned_branch
...
Teach git_branch_remote_name() to work with orphaned heads
2013-02-22 09:48:47 -08:00
Vicent Martí
698bf1da0e
Merge pull request #1354 from nulltoken/fix/stash-drop
...
Fix git_stash_drop()
2013-02-22 09:48:34 -08:00
Philip Kelley
6c72035fbc
Portability fixes for Solaris
2013-02-22 12:23:14 -05:00
nulltoken
bbc53e4f93
branch: refactor git_branch_remote_name() tests
2013-02-22 17:04:25 +01:00
nulltoken
c1b5e8c42b
branch: Make git_branch_remote_name() cope with orphaned heads
2013-02-22 17:04:23 +01:00
nulltoken
9ccab8dfb8
stash: Update the reference when dropping the topmost stash
2013-02-22 15:25:59 +01:00
nulltoken
39bcb4deb8
stash: Refactor stash::drop tests
2013-02-22 15:25:58 +01:00
nulltoken
d788499a10
ignore: enhance git_ignore_path_is_ignored() test coverage
2013-02-22 15:25:57 +01:00