|
c50c58de
|
2013-01-02T17:10:56
|
|
Extend tests for checkout with typechanges
Test a number of other cases, including intentionally forced
conflicts and deeper inspection that trees get created properly.
There is a still a bug in checkout because the first test here
(i.e. test_checkout_typechange__checkout_typechanges_safe) should
be able to pass with GIT_CHECKOUT_SAFE as a strategy, but it will
not because of some lingering submodule checkout issues.
|
|
|
e0548c0e
|
2013-01-02T17:09:07
|
|
Fix some submodule and typechange checkout cases
There were a bunch of small bugs in the checkout code where I was
assuming that a typechange was always from a tree to a blob or
vice versa. This fixes up most of those cases. Also, there were
circumstances where the submodule definitions were changed by the
checkout and the submodule data was not getting reloaded properly
before the new submodules were checked out.
|
|
|
546d65a8
|
2013-01-02T17:01:34
|
|
Fix up spoolandsort iterator usage
The spoolandsort iterator changes got sort-of cherry picked out of
this branch and so I dropped the commit when rebasing; however,
there were a few small changes that got dropped as well (since the
version merged upstream wasn't quite the same as what I dropped).
|
|
|
a9a73007
|
2012-12-20T16:16:22
|
|
Submodule caching fix and location API
This adds a new API to the submodule interface that just returns
where information about the submodule was found (e.g. config file
only or in the HEAD, index, or working directory).
Also, the old "refresh" call was potentially keeping some stale
submodule data around, so this simplfies that code and literally
discards the old cache, then reallocates.
|
|
|
16a666d3
|
2013-01-02T17:05:54
|
|
Fix workdir notifications and removals
The notifications were broken from the various iterations over
this code and were not returning working dir item data correctly.
Also, workdir items that were alphabetically after the last item
in diff were not being processed.
|
|
|
6f58332f
|
2012-12-20T16:15:02
|
|
Fix use of uninitialized variable
|
|
|
8fe713cc
|
2012-12-19T15:06:14
|
|
Make git_oid_tostr use out buffer for NULL oid
Previously a NULL oid was handled like an empty buffer and
returned a status empty string. This makes git_oid_tostr()
set the output buffer to the empty string instead.
|
|
|
5cf9875a
|
2012-12-18T15:19:24
|
|
Add index updating to checkout
Make checkout update entries in the index for all files that are
updated and/or removed, unless flag GIT_CHECKOUT_DONT_UPDATE_INDEX
is given. To do this, iterators were extended to allow a little
more introspection into the index being iterated over, etc.
|
|
|
7e5c8a5b
|
2012-12-10T15:31:43
|
|
More checkout improvements
This flips checkout back to be driven off the changes between
the baseline and the target trees. This reinstates the complex
code for tracking the contents of the working directory, but
overall, I think the resulting logic is easier to follow.
|
|
|
cf208031
|
2012-12-06T13:36:17
|
|
Rework checkout internals (again)
I've tried to map out the detailed behaviors of checkout and make
sure that we're handling the various cases correctly, along with
providing options to allow us to emulate "git checkout" and "git
checkout-index" with the various flags. I've thrown away flags
in the checkout API that seemed like clutter and added some new
ones. Also, I've converted the conflict callback to a general
notification callback so we can emulate "git checkout" output and
display "dirty" files.
As of this commit, the new behavior is not working 100% but some
of that is probably baked into tests that are not testing the
right thing. This is a decent snapshot point, I think, along the
way to getting the update done.
|
|
|
bfe7d7de
|
2012-11-26T17:24:02
|
|
Reorder operations in git reset
This corrects the order of operations in git reset so that the
checkout to reset the working directory content is done before
the HEAD is moved. This allows us to use the HEAD and the index
content to know what files can / should safely be reset.
Unfortunately, there are still some cases where the behavior of
this revision differs from core git. Notable, a file which has
been added to the index but is not present in the HEAD is
considered to be tracked by core git (and thus removable by a
reset command) whereas since this loads the target state into
the index prior to resetting, it will consider such a file to be
untracked and won't touch it. That is a larger fix that I'll
defer to a future commit.
|
|
|
a6a82e1a
|
2012-12-19T15:06:40
|
|
Improve error propagation in stash
Stash was sometimes obscuring the actual error code, replacing it
with a -1 when there was more descriptive value. This updates
stash to preserve the original error code more reliably along
with a variety of other error handling tweaks.
I believe this is an improvement, but arguably, preserving the
underlying error code may result in values that are harder to
interpret by the caller who does not understand the internals.
Discussion is welcome!
|
|
|
6ac724af
|
2012-12-18T15:12:06
|
|
Clear error to avoid leaving invalid error behind
|
|
|
e9e20c84
|
2012-12-19T14:52:12
|
|
Update cl_git_pass to return more info
This adds a failure reporting function that is called by
cl_git_pass which captures the actual error return code and
the error message if available in the failure report.
|
|
c5df10f4
|
2012-11-30T10:59:03
|
|
Failing test on git_checkout_tree when removing directories
|
|
d0951175
|
2012-12-06T16:12:21
|
|
Add failing test to demonstrate wrong checkout behaviour
|
|
|
6fee906c
|
2012-12-18T15:13:11
|
|
missing error message is confusing
|
|
60406162
|
2013-01-04T20:28:33
|
|
clar: lolpython
|
|
|
3a4a961d
|
2013-01-04T20:25:10
|
|
clar: Corrupted pickles
|
|
c18a5ec5
|
2013-01-04T11:10:39
|
|
Merge pull request #1174 from nulltoken/topic/soft_reset_with_index_conflicts
Prevent soft reset when index contains conflicts
|
|
702c3bf7
|
2013-01-04T19:01:36
|
|
clar: make it compatible with python3
|
|
|
1d5d4186
|
2013-01-04T20:02:01
|
|
clar: haha
|
|
|
73b58c91
|
2013-01-04T20:00:09
|
|
clar: fix warning on Windows
|
|
bdb2f242
|
2013-01-04T19:54:45
|
|
Ignore clar.suite.rule
|
|
27fe6efe
|
2013-01-04T13:48:08
|
|
Fix git_index sorting with core.ignorecase in git_index_read
|
|
|
9a0d5904
|
2012-12-27T13:42:27
|
|
reset: Cannot soft reset with a conflicted index
|
|
|
52ee071b
|
2013-01-04T09:33:54
|
|
Merge pull request #1189 from martinwoodward/tests-compliance
Add jGit license block to derrived tests
|
|
ba1a430a
|
2013-01-04T17:29:45
|
|
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.
|
|
|
8978f1de
|
2013-01-04T17:52:49
|
|
Merge branch 'clar2' into development
Conflicts:
src/pqueue.c
src/pqueue.h
src/util.c
tests-clar/merge/setup.c
|
|
|
a7ffd936
|
2013-01-04T17:46:38
|
|
clar: fix merge/setup.c
|
|
d0ae8b98
|
2013-01-03T16:15:52
|
|
Remove whitespace
|
|
|
ed8fb821
|
2013-01-03T16:14:23
|
|
Add note in CONVENTIONS about inlined functions
|
|
|
10aa44ce
|
2013-01-03T23:42:04
|
|
Add Brian Downing to the hall of fame
|
|
5a62d659
|
2013-01-03T12:44:09
|
|
MERGE_HEAD contents iterator
|
|
|
9651fdc2
|
2013-01-03T22:28:59
|
|
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
|
|
|
43464497
|
2013-01-03T22:24:10
|
|
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.
|
|
d73d52df
|
2013-01-03T13:26:11
|
|
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
|
|
|
931b8b70
|
2013-01-03T22:16:37
|
|
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
|
|
|
35560d6d
|
2013-01-03T15:53:50
|
|
expose merge metadata cleanup
|
|
b60b4562
|
2013-01-03T16:31:36
|
|
add option to allow git note overwrite
|
|
|
853488ee
|
2013-01-03T08:45:09
|
|
Fix git__strncasecmp
|
|
|
b421decc
|
2013-01-03T15:43:51
|
|
notes.c - whitespace fix
|
|
|
686a243a
|
2013-01-04T08:36:13
|
|
Merge pull request #1184 from ethomson/mergehead_iterator
MERGE_HEAD contents iterator
|
|
|
37955f54
|
2013-01-04T07:33:31
|
|
Merge pull request #1183 from congyiwu/push_delete_fix
Fix bug in gen_pktline() for deletes of missing remote refs
|
|
|
acb0f65f
|
2013-01-04T03:57:31
|
|
Merge pull request #1188 from tnm/inline-convention
Inline convention
|
|
|
f783f76e
|
2013-01-03T16:15:52
|
|
Remove whitespace
|
|
|
394711ff
|
2013-01-03T16:14:23
|
|
Add note in CONVENTIONS about inlined functions
|
|
|
60d61926
|
2013-01-03T15:46:23
|
|
Merge pull request #1187 from martinwoodward/give-props
Add Brian Downing to the hall of fame
|
|
|
c999e1c3
|
2013-01-03T23:42:04
|
|
Add Brian Downing to the hall of fame
|
|
|
dccec593
|
2013-01-03T14:46:45
|
|
Merge pull request #1186 from martinwoodward/compliance-audit
License Compliance Audit
|
|
|
42e50b5e
|
2013-01-03T12:44:09
|
|
MERGE_HEAD contents iterator
|
|
|
1c5b3a41
|
2013-01-03T22:28:59
|
|
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
|
|
|
0470f8fc
|
2013-01-03T22:24:10
|
|
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.
|
|
|
4128f5aa
|
2013-01-03T13:26:11
|
|
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
|
|
|
9a919301
|
2013-01-03T22:16:37
|
|
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
|
|
|
b449a9ae
|
2013-01-03T13:57:17
|
|
Merge pull request #1185 from ethomson/cleanup_merge
expose merge metadata cleanup
|
|
|
ad2bc32f
|
2013-01-03T15:53:50
|
|
expose merge metadata cleanup
|
|
|
b8a1ea7c
|
2013-01-03T11:04:03
|
|
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.
|
|
|
54254a0f
|
2013-01-03T19:38:29
|
|
Status tests...
|
|
|
7b51d675
|
2013-01-03T19:17:07
|
|
Even more cleanups
|
|
|
f6fded8f
|
2013-01-03T19:07:41
|
|
Proper cleanup jeez
|
|
600d8dbf
|
2013-01-03T09:10:38
|
|
Move test cleanup into cleanup functions
|
|
|
bffbeebb
|
2013-01-03T08:38:00
|
|
Cleanup after tests
|
|
|
6fef1ab3
|
2013-01-03T07:47:51
|
|
Tests should clean up after themselves
|
|
|
07871d3a
|
2013-01-03T07:43:27
|
|
Merge pull request #1181 from nvloff/allow_note_overwrite
Allow note overwrite
|
|
|
8716b499
|
2013-01-03T16:31:36
|
|
add option to allow git note overwrite
|
|
|
0db4cd04
|
2013-01-03T08:45:09
|
|
Fix git__strncasecmp
|
|
|
4a44087a
|
2013-01-03T15:43:51
|
|
notes.c - whitespace fix
|
|
|
7761ce21
|
2013-01-03T04:24:12
|
|
Merge branch 'development' into clar2
Conflicts:
tests-clar/clone/nonetwork.c
tests-clar/online/clone.c
tests-clar/online/fetchhead.c
|
|
|
4236164a
|
2013-01-03T02:37:28
|
|
Prototypes warning goes away
|
|
|
a2188625
|
2013-01-03T02:35:23
|
|
Remove the submodule from travis
|
|
|
2e6f06a8
|
2013-01-03T02:34:45
|
|
...and add Clar raw
|
|
|
8ee7174b
|
2013-01-03T02:22:42
|
|
Remove the clar submodule
|
|
|
f46769e5
|
2013-01-03T02:13:37
|
|
Fix network suite
|
|
|
afb18116
|
2013-01-03T01:04:18
|
|
/deal with it
|
|
|
39444bea
|
2013-01-03T01:01:03
|
|
...fine
|
|
|
ad27838b
|
2013-01-03T00:58:46
|
|
Proper submodule dependency
|
|
|
6443eaf2
|
2013-01-03T00:50:29
|
|
Disable Network suite by default
|
|
|
922dd978
|
2013-01-02T13:54:37
|
|
Move some clone tests to the nonetwork suite
|
|
|
cd5ca5b9
|
2013-01-02T13:50:41
|
|
Merge pull request #1152 from ben/clone-api-structification
Segregate in-memory and persisted remotes
|
|
|
730df6d0
|
2013-01-02T13:43:54
|
|
Include checkout options inline
|
|
|
39cd0177
|
2013-01-02T22:38:10
|
|
This is a better name
|
|
|
a44f2e9e
|
2013-01-02T22:26:34
|
|
Try it like this...
|
|
|
c07b52df
|
2013-01-02T12:48:17
|
|
Remove `inmem` flag, use NULL name instead
|
|
|
0642c143
|
2013-01-02T12:44:47
|
|
Move `url` to last place in parameter list
|
|
|
e229c048
|
2013-01-02T21:25:32
|
|
Fuck you CMake
|
|
|
0df41675
|
2013-01-02T21:22:19
|
|
Submodule checkout
|
|
|
a368fd0f
|
2013-01-02T20:08:49
|
|
Checkout test
|
|
2e40c616
|
2013-01-02T16:27:22
|
|
path: ifdef GIT_WIN32 looks_like_network_computer_name()
|
|
|
5c2d3f6d
|
2013-01-02T04:17:31
|
|
Add build dependency for clar. Also, fuck you CMake. Fuck you.
|
|
|
b0a45829
|
2012-12-19T01:10:13
|
|
Bump the Clar submodule
|
|
|
156cfec0
|
2012-12-19T00:12:26
|
|
Cleanup Clar to make it SIMPLER
|
|
|
036e81f7
|
2012-12-29T04:08:58
|
|
Merge pull request #1177 from arrbee/update-example-showindex
Update showindex example
|
|
|
dbc4aa07
|
2012-12-28T22:00:24
|
|
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.
|
|
|
3d4064a2
|
2012-12-28T10:34:35
|
|
Merge pull request #1176 from arrbee/fix-iter-memleak
Alternative fix for iterator memory leak
|
|
|
645e67e8
|
2012-12-28T07:18:55
|
|
Merge pull request #1171 from csware/fix-compilation-vs2012
Fixed compilation with =>VS2010
|
|
46c2c1d5
|
2012-12-28T13:29:16
|
|
Fixed compilation with VS >= 2010
Starting with VS2010 MS ships a stdint.h.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
3865f7f6
|
2012-12-27T23:23:12
|
|
Invalid ref name normalization leaked memory
When normalizing a reference name, if there is an error because
the name is invalid, then the memory allocated for storing the
name could be leaked if the caller was not careful and assumed
that the error return code meant that no allocation had occurred.
This fixes that by explicitly deallocating the reference name
buffer if there is an error in normalizing the name.
|
|
|
f616a36b
|
2012-12-27T22:25:52
|
|
Make spoolandsort a pushable iterator behavior
An earlier change to `git_diff_from_iterators` introduced a
memory leak where the allocated spoolandsort iterator was not
returned to the caller and thus not freed.
One proposal changes all iterator APIs to use git_iterator** so
we can reallocate the iterator at will, but that seems unexpected.
This commit makes it so that an iterator can be changed in place.
The callbacks are isolated in a separate structure and a pointer
to that structure can be reassigned by the spoolandsort extension.
This means that spoolandsort doesn't create a new iterator; it
just allocates a new block of callbacks (along with space for its
own extra data) and swaps that into the iterator.
Additionally, since spoolandsort is only needed to switch the
case sensitivity of an iterator, this simplifies the API to only
take the ignore_case boolean and to be a no-op if the iterator
already matches the requested case sensitivity.
|
|
|
3de22567
|
2012-12-27T11:12:14
|
|
Fix warnings in example
|