proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 07:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,935 Commits 2 Branches 0 Tags 22 MiB
ced8eff1e5
Commit Graph

3935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vicent Marti
73b58c9159 clar: fix warning on Windows 2013-01-04 20:00:09 +01:00
nulltoken
bdb2f24223 Ignore clar.suite.rule 2013-01-04 19:54:45 +01:00
Philip Kelley
27fe6efe85 Fix git_index sorting with core.ignorecase in git_index_read 2013-01-04 13:48:08 -05: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
8978f1de0c Merge branch 'clar2' into development 
Conflicts:
	src/pqueue.c
	src/pqueue.h
	src/util.c
	tests-clar/merge/setup.c
 2013-01-04 17:53:45 +01:00
Vicent Marti
a7ffd936bf clar: fix merge/setup.c 2013-01-04 17:47:52 +01:00
Ted Nyman
d0ae8b98de Remove whitespace 2013-01-04 17:47:52 +01:00
Ted Nyman
ed8fb8210d Add note in CONVENTIONS about inlined functions 2013-01-04 17:47:51 +01:00
Martin Woodward
10aa44cee2 Add Brian Downing to the hall of fame 2013-01-04 17:47:51 +01:00
Edward Thomson
5a62d659bc MERGE_HEAD contents iterator 2013-01-04 17:47:51 +01:00
Martin Woodward
9651fdc297 Give proper license notice to code from Android 
The usage of the Android derrived code contains a full notice
which must be provided with the source code as per the terms
given at:
https://android.googlesource.com/platform/bionic/+/android-4.0.3_r1.1/libc/bionic/dirname_r.c
 2013-01-04 17:47:51 +01:00
Martin Woodward
43464497ab Add full license notice to bsearch code 
The original BSD glibc code contains the notice as given at
http://opensource.apple.com/source/gcc/gcc-5666.3/libiberty/bsearch.c
and should be given in full along with the code.
 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
Martin Woodward
931b8b709c Add Apache license header back to libpqueue files 
The original libpqueue file were licensed under Apache 2.0 so
therefore should retain their copyrights and header as per the
license terms at http://www.apache.org/licenses/LICENSE-2.0
 2013-01-04 17:47:51 +01:00
Edward Thomson
35560d6d14 expose merge metadata cleanup 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
Philip Kelley
853488eed4 Fix git__strncasecmp 2013-01-04 17:47:51 +01:00
Nikolai Vladimirov
b421decc76 notes.c - whitespace fix 2013-01-04 17:47:51 +01:00
Vicent Martí
686a243a73 Merge pull request #1184 from ethomson/mergehead_iterator 
MERGE_HEAD contents iterator
 2013-01-04 08:36:13 -08:00
Philip Kelley
37955f5401 Merge pull request #1183 from congyiwu/push_delete_fix 
Fix bug in gen_pktline() for deletes of missing remote refs
 2013-01-04 07:33:31 -08:00
Vicent Martí
acb0f65ff8 Merge pull request #1188 from tnm/inline-convention 
Inline convention
 2013-01-04 03:57:31 -08:00
Ted Nyman
f783f76efb Remove whitespace 2013-01-03 16:15:52 -08:00
Ted Nyman
394711ff75 Add note in CONVENTIONS about inlined functions 2013-01-03 16:14:23 -08:00
Vicent Martí
60d61926d3 Merge pull request #1187 from martinwoodward/give-props 
Add Brian Downing to the hall of fame
 2013-01-03 15:46:23 -08:00
Martin Woodward
c999e1c307 Add Brian Downing to the hall of fame 2013-01-03 23:42:04 +00:00
Vicent Martí
dccec59336 Merge pull request #1186 from martinwoodward/compliance-audit 
License Compliance Audit
 2013-01-03 14:46:45 -08:00
Edward Thomson
42e50b5ed1 MERGE_HEAD contents iterator 2013-01-03 16:35:59 -06:00
Martin Woodward
1c5b3a4185 Give proper license notice to code from Android 
The usage of the Android derrived code contains a full notice
which must be provided with the source code as per the terms
given at:
https://android.googlesource.com/platform/bionic/+/android-4.0.3_r1.1/libc/bionic/dirname_r.c
 2013-01-03 22:28:59 +00:00
Martin Woodward
0470f8fc9d Add full license notice to bsearch code 
The original BSD glibc code contains the notice as given at
http://opensource.apple.com/source/gcc/gcc-5666.3/libiberty/bsearch.c
and should be given in full along with the code.
 2013-01-03 22:24:10 +00:00
Congyi Wu
4128f5aa31 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-03 17:19:55 -05:00
Martin Woodward
9a919301c6 Add Apache license header back to libpqueue files 
The original libpqueue file were licensed under Apache 2.0 so
therefore should retain their copyrights and header as per the
license terms at http://www.apache.org/licenses/LICENSE-2.0
 2013-01-03 22:16:37 +00:00
Vicent Martí
b449a9ae8c Merge pull request #1185 from ethomson/cleanup_merge 
expose merge metadata cleanup
 2013-01-03 13:57:17 -08:00
Edward Thomson
ad2bc32fa3 expose merge metadata cleanup 2013-01-03 15:53:50 -06: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
Vicent Martí
07871d3adc Merge pull request #1181 from nvloff/allow_note_overwrite 
Allow note overwrite
 2013-01-03 07:43:27 -08:00
Nikolai Vladimirov
8716b499e2 add option to allow git note overwrite 2013-01-03 16:31:36 +02:00
Philip Kelley
0db4cd04ef Fix git__strncasecmp 2013-01-03 08:45:09 -05:00
Nikolai Vladimirov
4a44087ae7 notes.c - whitespace fix 2013-01-03 15:43:51 +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
4236164a77 Prototypes warning goes away 2013-01-03 02:37:28 +01:00
Vicent Marti
a218862557 Remove the submodule from travis 2013-01-03 02:35:23 +01:00
Vicent Marti
2e6f06a8d4 ...and add Clar raw 2013-01-03 02:34:45 +01:00