Vicent Marti
6040616214
clar: lolpython
2013-01-04 20:28:33 +01:00
Vicent Marti
3a4a961da5
clar: Corrupted pickles
2013-01-04 20:25:57 +01:00
Vicent Martí
c18a5ec58c
Merge pull request #1174 from nulltoken/topic/soft_reset_with_index_conflicts
...
Prevent soft reset when index contains conflicts
2013-01-04 11:10:39 -08:00
Carlos Martín Nieto
702c3bf70e
clar: make it compatible with python3
2013-01-04 19:03:02 +00:00
Vicent Marti
1d5d418671
clar: haha
2013-01-04 20:02:01 +01:00
Vicent Marti
73b58c9159
clar: fix warning on Windows
2013-01-04 20:00:09 +01:00
nulltoken
9a0d590412
reset: Cannot soft reset with a conflicted index
2013-01-04 18:43:34 +01:00
Vicent Martí
52ee071b35
Merge pull request #1189 from martinwoodward/tests-compliance
...
Add jGit license block to derrived tests
2013-01-04 09:33:54 -08:00
Martin Woodward
ba1a430a8b
Add jGit license block to derrived tests
...
Add the jGit license block to tests derrived from jGit as per the
terms of the BSD license.
2013-01-04 17:29:45 +00:00
Vicent Marti
a7ffd936bf
clar: fix merge/setup.c
2013-01-04 17:47:52 +01:00
Edward Thomson
5a62d659bc
MERGE_HEAD contents iterator
2013-01-04 17:47:51 +01:00
Congyi Wu
d73d52dfcb
Fix bug in gen_pktline() for deletes of missing remote refs
...
* gen_pktline() in smart_protocol.c was skipping refspecs that deleted
refs that were not advertised by the server. The new behavior is to
send a delete command with an old-id of zero, which matches the behavior
of the official git client.
* Update test_network_push__delete() in reaction to above fix.
* Obviate messy logic that handles missing push_spec rrefs by canonicalizing
push_spec. After calculate_work(), loid, roid, and rref, are filled in with
exactly what is sent to the server
2013-01-04 17:47:51 +01:00
Nikolai Vladimirov
b60b4562fe
add option to allow git note overwrite
2013-01-04 17:47:51 +01:00
Russell Belfer
b8a1ea7cf9
Fix core::env cleanup code
...
Mark fake home directories that failed to be created, so we won't
try to remove them and have cleanup just use p_rmdir.
2013-01-03 11:04:03 -08:00
Vicent Marti
54254a0fe2
Status tests...
2013-01-03 19:38:29 +01:00
Vicent Marti
7b51d675e8
Even more cleanups
2013-01-03 19:17:07 +01:00
Vicent Marti
f6fded8f91
Proper cleanup jeez
2013-01-03 19:07:41 +01:00
Ben Straub
600d8dbf6d
Move test cleanup into cleanup functions
2013-01-03 09:10:38 -08:00
Ben Straub
bffbeebbec
Cleanup after tests
2013-01-03 08:38:00 -08:00
Ben Straub
6fef1ab344
Tests should clean up after themselves
2013-01-03 07:47:51 -08:00
Nikolai Vladimirov
8716b499e2
add option to allow git note overwrite
2013-01-03 16:31:36 +02:00
Vicent Marti
7761ce2162
Merge branch 'development' into clar2
...
Conflicts:
tests-clar/clone/nonetwork.c
tests-clar/online/clone.c
tests-clar/online/fetchhead.c
2013-01-03 04:24:12 +01:00
Vicent Marti
2e6f06a8d4
...and add Clar raw
2013-01-03 02:34:45 +01:00
Vicent Marti
8ee7174be9
Remove the clar submodule
2013-01-03 02:22:42 +01:00
Vicent Marti
f46769e52a
Fix network suite
2013-01-03 02:13:37 +01:00
Vicent Marti
6443eaf22f
Disable Network suite by default
2013-01-03 00:50:29 +01:00
Ben Straub
922dd9788c
Move some clone tests to the nonetwork suite
2013-01-02 13:54:37 -08:00
Vicent Martí
cd5ca5b97f
Merge pull request #1152 from ben/clone-api-structification
...
Segregate in-memory and persisted remotes
2013-01-02 13:50:41 -08:00
Ben Straub
730df6d0f7
Include checkout options inline
2013-01-02 13:43:54 -08:00
Vicent Marti
39cd01779c
This is a better name
2013-01-02 22:38:10 +01:00
Ben Straub
0642c1431e
Move url
to last place in parameter list
2013-01-02 12:44:47 -08:00
Vicent Marti
5c2d3f6d5d
Add build dependency for clar. Also, fuck you CMake. Fuck you.
2013-01-02 04:19:13 +01:00
Vicent Marti
b0a4582975
Bump the Clar submodule
2013-01-02 02:05:11 +01:00
Vicent Marti
156cfec096
Cleanup Clar to make it SIMPLER
2013-01-02 02:05:11 +01:00
nulltoken
50a762a563
path: Teach UNC paths to git_path_dirname_r()
...
Fix libgit2/libgit2sharp#256
2012-12-26 23:07:25 +01:00
nulltoken
34b6f05f39
path: enhance git_path_dirname_r() test coverage
2012-12-26 11:59:07 +01:00
nulltoken
19c3c99ca8
remote: remove duplicated test
2012-12-24 18:18:40 +01:00
nulltoken
f19304d265
remote: Prevent create() from blindly overwriting
2012-12-24 18:18:31 +01:00
nulltoken
b0aa14aa3c
remote: Enhance in-memory remote test coverage
2012-12-24 16:54:27 +01:00
nulltoken
6bd09ecc14
Fix MSSVC compilation issue
2012-12-24 16:54:26 +01:00
Ben Straub
2808ec9ab4
Rename test to make @nulltoken happy
2012-12-21 13:15:37 -08:00
Ben Straub
79000951ec
In-memory remotes don't have names
2012-12-21 08:05:59 -08:00
Ben Straub
874dcb25eb
Remote: deprecate dangling, prevent saving in-memory
2012-12-20 12:01:13 -08:00
Ben Straub
29f27599ea
Rename remote creation APIs
...
git_remote_add -> git_remote_create
git_remote_new -> git_remote_create_inmemory
2012-12-20 10:52:57 -08:00
Ben Straub
621b50e4d5
Clone: trust but verify
2012-12-19 17:02:06 -08:00
Ben Straub
b412d56389
Add more clone options. Push test suite segfaults.
2012-12-19 17:02:06 -08:00
Edward Thomson
7fcec83428
fetchhead reading/iterating
2012-12-19 16:57:30 -06:00
Sascha Cunz
d5cf4665a9
Fix some leaks and (possibly) dangling pointers in tests
...
Also adds some asserts.
2012-12-19 08:04:31 +01:00
Sascha Cunz
96a289f5f3
clone-empty-test: Don't use one pointer for two things
...
... so we can clean up correctly.
2012-12-19 05:24:23 +01:00
Sascha Cunz
3dc0207bc0
revwalk-test: Don't leak the second repository
2012-12-19 05:22:46 +01:00
Sascha Cunz
26290cd13b
Reset global variable to NULL after free'ing resource
2012-12-18 19:52:37 +01:00
Vicent Martí
e62171e2fc
Merge pull request #1151 from arrbee/fix-diff-constructor-names
...
Fix diff constructor names
2012-12-17 11:10:25 -08:00
Russell Belfer
56c72b759c
Fix diff constructor name order confusion
...
The diff constructor functions had some confusing names, where the
"old" side of the diff was coming after the "new" side. This
reverses the order in the function name to make it less confusing.
Specifically...
* git_diff_index_to_tree becomes git_diff_tree_to_index
* git_diff_workdir_to_index becomes git_diff_index_to_workdir
* git_diff_workdir_to_tree becomes git_diff_tree_to_workdir
2012-12-17 11:00:53 -08:00
Vicent Martí
0d10e79dd9
Merge pull request #1149 from nulltoken/topic/blob_isbinary
...
Introduce git_blob_is_binary()
2012-12-17 10:13:36 -08:00
nulltoken
a3337f10bb
blob: introduce git_blob_is_binary()
2012-12-17 17:20:31 +01:00
Sascha Cunz
22d23c61ed
Cleanup the test correctly
2012-12-17 17:15:58 +01:00
Ben Straub
c4e3e797d1
Ensure static variables are nulled after every test
2012-12-16 12:27:11 -08:00
Ben Straub
a7f125cdba
Fix fetchhead tests
2012-12-15 14:56:20 -08:00
Ben Straub
57f5d8dca5
Remove placeholder files during tests
2012-12-14 14:15:42 -08:00
Ben Straub
1164acde96
Rebase fixup
2012-12-14 14:00:35 -08:00
Ben Straub
850b1edfe8
Allow clone to handle empty repos
2012-12-14 13:58:44 -08:00
Ben Straub
b9e7e2b4e1
Move non-options back out of options struct
2012-12-14 13:46:45 -08:00
Ben Straub
18b2d560d3
Deploy git_clone_options; remove git_clone_bare
2012-12-14 13:03:59 -08:00
Vicent Marti
2d466b7dcb
tests: Fix unused temp repo
2012-12-14 02:49:11 +01:00
Vicent Marti
509216a5b2
test: Fix clone tests
2012-12-14 02:49:01 +01:00
Vicent Marti
b0b9fd3245
Merge remote-tracking branch 'origin/clone-auth' into development
2012-12-14 02:41:53 +01:00
Jameson Miller
8a8820d89f
Add test to clone with absolute path
2012-12-13 17:58:12 -05:00
Ben Straub
24393ea6d3
Stop premature remote freeing when cloning
2012-12-13 09:14:56 -08:00
Ben Straub
7c353afd0e
Define constant for default fetch spec
2012-12-13 08:47:29 -08:00
Ben Straub
44f36f6e3b
Convert clone to use dangling remotes
2012-12-12 19:48:44 -08:00
Ben Straub
b914e17d82
API to set a dangling remote's repository
2012-12-12 12:23:24 -08:00
Ben Straub
a71c27ccda
Allow creation of dangling remotes
2012-12-12 12:15:25 -08:00
Russell Belfer
91e7d26303
Fix iterator reset and add reset ranges
...
The `git_iterator_reset` command has not been working in all cases
particularly when there is a start and end range. This fixes it
and adds tests for it, and also extends it with the ability to
update the start/end range strings when an iterator is reset.
2012-12-10 15:38:41 -08:00
Russell Belfer
9950d27ab6
Clean up iterator APIs
...
This removes the need to explicitly pass the repo into iterators
where the repo is implied by the other parameters. This moves
the repo to be owned by the parent struct. Also, this has some
iterator related updates to the internal diff API to lay the
groundwork for checkout improvements.
2012-12-10 15:38:28 -08:00
Ben Straub
59bccf33c4
Add a payload param to git_cred_acquire_cb
...
Fixes #1128 .
2012-12-10 11:11:01 -08:00
Ben Straub
72629a10e3
Clean up GCC build warnings
2012-12-10 10:05:31 -08:00
Scott J. Goldman
b337814e70
Fix no_common_ancestor test for ahead_behind count
...
Ahead-behind count is still a valid operation, even if the two
commits don't have a common merge-base. The old implementation was
buggy, so it returned ENOTFOUND. Fixed now.
2012-12-09 21:04:32 -08:00
Carlos Martín Nieto
f1c75b94a1
tree: relax the filemode parser
...
There are many different broken filemodes in the wild so we need to
protect against them and give something useful up the chain. Don't
fail when reading a tree from the ODB but normalize the mode as best
we can.
As 664 is no longer a mode that we consider to be valid and gets
normalized to 644, we can stop accepting it in the treebuilder. The
library won't expose it to the user, so any invalid modes are a bug.
2012-12-07 16:59:18 +01:00
Vicent Marti
a9c07c47ea
tests: MSVC fix
2012-12-05 21:06:54 +01:00
Vicent Marti
bf192cdb43
versions: MSVC build fixes
2012-12-05 20:56:27 +01:00
Vicent Martí
e05ca13f1f
Merge pull request #1115 from ben/struct-versions
...
Version info for public structs
2012-12-05 11:47:19 -08:00
Edward Thomson
b241466133
status should ignore conflicts entries in the index
2012-12-03 14:51:39 -06:00
Ben Straub
de70aea6b1
Remove GIT_SIGNATURE_VERSION and friends
2012-12-03 12:41:50 -08:00
nulltoken
cc1466264a
revparse: Deploy EINVALIDSPEC usage
2012-12-01 08:34:31 +01:00
nulltoken
84166facc9
revparse: remove timezone setup in tests
2012-12-01 08:34:30 +01:00
nulltoken
bc05f30c47
object: refine git_object_peel() error report
2012-12-01 08:34:29 +01:00
nulltoken
621730383a
branch: Deploy EINVALIDSPEC usage
2012-12-01 08:34:28 +01:00
nulltoken
18d6f12040
tag: Deploy EINVALIDSPEC usage
2012-12-01 08:34:28 +01:00
nulltoken
80212ecb1c
reflog: Deploy EINVALIDSPEC usage
2012-12-01 08:34:27 +01:00
nulltoken
e4aa7f58fe
refs: cover git_reference_name_to_oid() unfound behavior
2012-12-01 08:34:26 +01:00
nulltoken
80d9d1df14
refs: Deploy EINVALIDSPEC usage
2012-12-01 08:34:26 +01:00
nulltoken
47261d9c8a
tests: drop unused variables
2012-12-01 08:34:25 +01:00
nulltoken
032ba9e4ad
remote: deploy EINVALIDSPEC usage
2012-12-01 08:34:23 +01:00
nulltoken
3da73c40fc
Fix compilation warnings
2012-12-01 08:34:21 +01:00
Ben Straub
0ab3a2ab2c
Deploy GIT_INIT_STRUCTURE
2012-11-30 20:34:50 -08:00
Ben Straub
1071176900
Deploy versioned git_transport structure
2012-11-30 13:12:15 -08:00
Ben Straub
79cfa20d60
Deploy GIT_STATUS_OPTIONS_INIT
2012-11-30 13:12:15 -08:00
Ben Straub
b4d136527c
Deploy GIT_REPOSITORY_INIT_OPTIONS_INIT
2012-11-30 13:12:15 -08:00
Ben Straub
9267ff586f
Deploy GIT_REMOTE_CALLBACKS_INIT
2012-11-30 13:12:15 -08:00
Ben Straub
55f6f21b7d
Deploy versioned git_odb_backend structure
2012-11-30 13:12:15 -08:00