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
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
afb181167e
/deal with it
2013-01-03 01:04:18 +01:00
Vicent Marti
39444bea0a
...fine
2013-01-03 01:01:03 +01:00
Vicent Marti
ad27838bdc
Proper submodule dependency
2013-01-03 00:58:46 +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
Vicent Marti
a44f2e9e7b
Try it like this...
2013-01-02 22:26:34 +01:00
Ben Straub
c07b52df1b
Remove inmem flag, use NULL name instead
2013-01-02 12:48:17 -08:00
Ben Straub
0642c1431e
Move url to last place in parameter list
2013-01-02 12:44:47 -08:00
Vicent Marti
e229c04825
Fuck you CMake
2013-01-02 21:27:00 +01:00
Vicent Marti
0df4167577
Submodule checkout
2013-01-02 21:22:19 +01:00
Vicent Marti
a368fd0f79
Checkout test
2013-01-02 20:08:49 +01:00
Michael Schubert
2e40c616c7
path: ifdef GIT_WIN32 looks_like_network_computer_name()
2013-01-02 16:28:08 +01: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
Vicent Martí
036e81f726
Merge pull request #1177 from arrbee/update-example-showindex
...
Update showindex example
2012-12-29 04:08:58 -08:00
Russell Belfer
dbc4aa0750
Update showindex example
...
I find the showindex example to be pretty useful on occasion, but
there were are couple of output tweaks I wanted, plus I wanted the
ability to specify a path to an actual index file instead of having
to open the whole repository. This makes those changes and expands
the example slightly.
2012-12-28 22:00:24 -08:00
