|
6246de93
|
2014-03-06T11:16:36
|
|
Merge completed: resolve the conflict with the upstream
|
|
|
8384a50a
|
2014-03-05T20:33:20
|
|
fix the output format of diff
|
|
|
45d2e8dc
|
2014-03-05T20:13:34
|
|
Add the --shortstat flag to examples/diff.c
|
|
0d3c8a9d
|
2014-03-05T13:06:31
|
|
examples/diff: Add minimal, patience diff options.
- Add minimal, patience diff options to diff example. libgit2
`diff_xdiff.git_xdiff_init` already supports these flags, so
no additional change is necessary.
- Remove minimal and patience flag addition from project list.
|
|
b43f35fd
|
2014-03-03T14:59:50
|
|
- examples CMakeLists.txt reverted to previous state
|
|
6874cafd
|
2014-03-03T12:08:17
|
|
cmake examples change so that general.c is off by default
|
|
|
0330469f
|
2014-03-03T11:42:25
|
|
- general.c reverted to original( before pr state )
|
|
|
b5212858
|
2014-03-03T11:40:22
|
|
Merge remote-tracking branch 'remotes/upstream/development' into development
|
|
d8839992
|
2014-02-27T14:01:16
|
|
Fix warnings and code style issues
|
|
|
300f4412
|
2014-02-25T11:56:11
|
|
- BUGFIX #2133 (@fourplusone) in smart_protocol.c
- added MSVC cmake definitions to disable warnings
- general.c is rewritten so it is ansi-c compatible and compiles ok on microsoft windows
- some MSVC reported warning fixes
|
|
899bd19a
|
2014-02-24T21:20:57
|
|
Document enumerator and rewording
|
|
|
c7c83394
|
2014-02-21T00:22:07
|
|
Add option to limit blame to first parent
|
|
8086b78b
|
2014-02-09T21:08:42
|
|
replace 'out' with 'patch',replace the literal tabs with '\t'.
|
|
|
4f5a3f40
|
2014-02-08T20:10:19
|
|
add example for diff with --numstat
|
|
5c8be325
|
2014-02-05T13:32:45
|
|
Fix a few references to changed function signatures
|
|
93954245
|
2014-01-27T09:39:36
|
|
Merge pull request #2075 from libgit2/cmn/leftover-oid
Leftover OID -> ID changes
|
|
|
c90ea3de
|
2014-01-27T09:34:52
|
|
Merge pull request #2078 from linquize/msvc
MSVC doesn't like modern code neither
|
|
1664aaaa
|
2013-11-05T23:39:05
|
|
Make blame example compile on MSVC
|
|
|
fbc5661e
|
2014-01-27T20:51:46
|
|
MSVC doesn't like modern code neither
|
|
d541170c
|
2014-01-24T11:36:41
|
|
index: rename an entry's id to 'id'
This was not converted when we converted the rest, so do it now.
|
|
|
83e1efbf
|
2013-11-14T14:10:32
|
|
Update files that reference tests-clar
|
|
|
fb190bbb
|
2013-11-12T19:44:13
|
|
Fix warnings
|
|
|
6414fd33
|
2013-11-11T06:47:15
|
|
Merge pull request #1956 from libgit2/cmn/fetch-default-head
Remote revamp (director's cut)
|
|
|
359dce72
|
2013-11-02T00:05:32
|
|
remote: make _ls return the list directly
The callback-based method of listing remote references dates back to the
beginning of the network code's lifetime, when we didn't know any
better.
We need to keep the list around for update_tips() after disconnect() so
let's make use of this to simply give the user a pointer to the array so
they can write straightforward code instead of having to go through a
callback.
|
|
ad62f2ee
|
2013-11-07T12:00:43
|
|
update example to new packfile creation signature
|
|
|
b4794925
|
2013-11-04T15:54:11
|
|
blame sample: usage comment
|
|
|
ea8ce3d1
|
2013-11-04T15:50:33
|
|
Fix warnings
|
|
|
e6b85be7
|
2013-11-04T15:48:35
|
|
Reorganize and doc-commentify blame sample.
|
|
|
b7bb086b
|
2013-11-04T15:25:26
|
|
Standardize layout of blame sample
|
|
|
fb6b0e01
|
2013-11-04T10:44:59
|
|
Merge pull request #1317 from libgit2/blame
Blame Canada
|
|
|
a605bbd9
|
2013-11-04T10:14:22
|
|
Merge pull request #1934 from libgit2/relicense-examples
Relicense examples under CC0
|
|
|
5a0b8803
|
2013-11-04T08:05:55
|
|
Merge pull request #1929 from libgit2/rb/misc-diff-fixes
Fix some observed problems with incorrect diffs
|
|
|
becb13c0
|
2013-11-03T13:46:07
|
|
examples: doc update
Update the explanation to reflect our use of git_status_list_new() and
make the breaks in rocco more meaningful.
Clarify why GIT_STATUS_CURRENT and index_to_workdir don't always imply
each other. Fixes #1740.
|
|
|
6cb831bd
|
2013-11-02T05:33:26
|
|
Replace copyright topmatter in example files
|
|
|
dcfdb977
|
2013-11-01T10:51:12
|
|
Relicense examples under CC0
|
|
|
4bf630b6
|
2013-10-31T14:36:52
|
|
Make diff and status perform soft index reload
This changes `git_index_read` to have two modes - a hard index
reload that always resets the index to match the on-disk data
(which was the old behavior) and a soft index reload that uses
the timestamp / file size information and only replaces the index
data if the file on disk has been modified.
This then updates the git_status code to do a soft reload unless
the new GIT_STATUS_OPT_NO_REFRESH flag is passed in.
This also changes the behavior of the git_diff functions that use
the index so that when an index is not explicitly passed in (i.e.
when the functions call git_repository_index for you), they will
also do a soft reload for you.
This intentionally breaks the file signature of git_index_read
because there has been some confusion about the behavior previously
and it seems like all existing uses of the API should probably be
examined to select the desired behavior.
|
|
|
567649f2
|
2013-11-01T09:38:34
|
|
Merge pull request #1916 from libgit2/simplify-examples
Fix examples to make the important stuff more obvious
|
|
|
ac5e507c
|
2013-11-01T09:31:52
|
|
Merge pull request #1918 from libgit2/cmn/indexer-naming
indexer: remove the stream infix
|
|
|
4f62d559
|
2013-11-01T05:39:21
|
|
Fix typos
|
|
|
c44820c6
|
2013-10-31T23:42:50
|
|
A few formatting changes for rocco
I'm not too happy about manually inserting < and > but those get
output as html tags otherwise.
|
|
|
76120863
|
2013-10-31T14:48:41
|
|
Update examples/README.md
|
|
|
85c6730c
|
2013-10-31T14:35:32
|
|
Format comments for use with docco
|
|
|
864e7271
|
2013-10-31T20:58:00
|
|
Use gmtime() instead of gmtime_t()
The latter is not available on Windows
|
|
|
dbdb22b3
|
2013-10-30T13:20:08
|
|
Clean up showindex sample
|
|
|
b9d02460
|
2013-10-30T13:07:58
|
|
Reorganize rev-parse example
|
|
|
784b3abb
|
2013-10-30T12:34:03
|
|
rev-list.c example: use common utils, reorganize
|
|
|
9d83d368
|
2013-10-30T07:21:36
|
|
cat-file.c example: deploy helpers, reorg
|
|
|
dbfd2833
|
2013-10-30T07:21:12
|
|
add.c: proper frontmatter
|
|
|
a6154f21
|
2013-10-30T15:00:05
|
|
indexer: remove the stream infix
It was there to keep it apart from the one which read in from a file on
disk. This other indexer does not exist anymore, so there is no need for
anything other than git_indexer to refer to it.
While here, rename _add() function to _append() and _finalize() to
_commit(). The former change is cosmetic, while the latter avoids
talking about "finalizing", which OO languages use to mean something
completely different.
|
|
|
7cc3c9bf
|
2013-10-30T06:09:08
|
|
init.c example: deploy more helpers
|
|
|
e568bedf
|
2013-10-30T06:08:54
|
|
add.c example: deploy helpers, reorg
|
|
|
a8422f92
|
2013-10-30T05:38:12
|
|
init example: deploy helpers, reorg
|
|
|
66902d47
|
2013-10-29T18:30:49
|
|
Extract common example helpers and reorg examples
This reorganizes a few of the examples so that the main function
comes first with the argument parsing extracted into a helper
that can come at the end of the file (so the example focuses more
on the use of libgit2 instead of command line support). This also
creates a shared examples/common.[ch] so that useful helper funcs
can be shared across examples instead of repeated.
|
|
|
42c8f8f8
|
2013-10-28T11:04:58
|
|
Merge remote-tracking branch 'libgit2/development' into blame
|
|
|
5c50f22a
|
2013-10-28T09:25:44
|
|
Merge pull request #1891 from libgit2/cmn/fix-thin-packs
Add support for thin packs
|
|
|
ab46b1d8
|
2013-10-23T15:08:18
|
|
indexer: include the delta stats
The user is unable to derive the number of deltas in the pack, as that
would require them to capture the stats exactly in the moment between
download and final processing, which is abstracted away in the fetch.
Capture these numbers for the user and expose them in the progress
struct. The clone and fetch examples now also present this information
to the user.
|
|
|
ebbd48f0
|
2013-10-23T14:22:44
|
|
examples: show used local objects in fetch
Show how many local objects were used to fix the thin pack in our fetch
example.
|
|
|
3b5f7954
|
2013-10-21T13:42:42
|
|
Create git_diff_line and extend git_diff_hunk
Instead of having functions with so very many parameters to pass
hunk and line data, this takes the existing git_diff_hunk struct
and extends it with more hunk data, plus adds a git_diff_line.
Those structs are used to pass back hunk and line data instead of
the old APIs that took tons of parameters.
Some work that was previously only being done for git_diff_patch
creation (scanning the diff content for exact line counts) is now
done for all callbacks, but the performance difference should not
be noticable.
|
|
|
10672e3e
|
2013-10-15T15:10:07
|
|
Diff API cleanup
This lays groundwork for separating formatting options from diff
creation options. This groups the formatting flags separately
from the diff list creation flags and reorders the options. This
also tweaks some APIs to further separate code that uses patches
from code that just looks at git_diffs.
|
|
|
3ff1d123
|
2013-10-11T14:51:54
|
|
Rename diff objects and split patch.h
This makes no functional change to diff but renames a couple of
the objects and splits the new git_patch (formerly git_diff_patch)
into a new header file.
|
|
|
607fe733
|
2013-10-10T14:30:31
|
|
Fix post-line-range iteration
|
|
|
c1ca2b67
|
2013-10-10T14:30:05
|
|
Include signatures in blame hunks
|
|
|
ebd67243
|
2013-10-10T13:56:45
|
|
Only show lines that had blame run on them
|
|
|
d2e7532f
|
2013-10-10T13:56:28
|
|
Be more flexible with argument order and format
|
|
|
0a23d205
|
2013-10-09T16:18:32
|
|
Ignore more built examples
|
|
|
43a07b86
|
2013-10-09T16:16:43
|
|
Simplify loading blob
|
|
|
2ccc84d2
|
2013-10-09T16:07:36
|
|
Allow null bytes in blob
|
|
|
cb45dafa
|
2013-10-09T16:07:17
|
|
Initialize threading, fix broken strncmp
|
|
|
370d1d16
|
2013-10-09T14:41:44
|
|
Un-remove init example
|
|
|
0b33fca0
|
2013-10-02T13:39:35
|
|
indexer: fix thin packs
When given an ODB from which to read objects, the indexer will attempt
to inject the missing bases at the end of the pack and update the
header and trailer to reflect the new contents.
|
|
|
fc1f7d4f
|
2013-10-03T06:20:20
|
|
Merge branch 'development' into blame
Conflicts:
include/git2.h
|
|
|
0e0cf787
|
2013-10-02T14:04:44
|
|
clone: put the callbacks struct directly in the clone options
There's no need for this to be a pointer to somewhere else.
|
|
|
e3c131c5
|
2013-09-16T05:02:25
|
|
remote: move the credentials callback to the struct
Move this one as well, letting us have a single way of setting the
callbacks for the remote, and removing fields from the clone options.
|
|
|
d31402a3
|
2013-09-16T04:20:05
|
|
remote: put the _download() callback with the others
The text progress and update_tips callbacks are already part of the
struct, which was meant to unify the callback setup, but the download
one was left out.
|
|
|
de8fe729
|
2013-09-29T10:46:41
|
|
Fix typo
|
|
|
41dd999d
|
2013-09-25T14:47:32
|
|
Merge branch 'development' into blame
|
|
|
37f9e409
|
2013-09-13T21:43:00
|
|
Some tests with ident and crlf filters
Fixed the filter order to match core Git, too.
This test demonstrates an interesting behavior of core Git (which
is totally reasonable and which libgit2 matches, although mostly
by coincidence). If you use the ident filter and commit a file
with a garbage ident in it, like '$Id: this is just garbage$' and
then immediately do a 'git checkout-index' with the new file, Git
will not consider the file out of date and will not overwrite the
file with an updated $Id$. Libgit2 has the same behavior. If you
remove the file and then do a checkout-index, it will be replaced
with a filtered version that has injected the OID correctly.
|
|
|
605da51a
|
2013-09-17T09:50:30
|
|
No such thing as an orphan branch
Unfortunately git-core uses the term "unborn branch" and "orphan
branch" interchangeably. However, "orphan" is only really there for
the checkout command, which has the `--orphan` option so it doesn't
actually create the branch.
Branches never have parents, so the distinction of a branch with no
parents is odd to begin with. Crucially, the error messages deal with
unborn branches, so let's use that.
|
|
|
4c7fdb4d
|
2013-09-16T16:27:10
|
|
Add blame example
|
|
|
0c52b204
|
2013-09-09T11:07:17
|
|
Make work if built with threading enabled
|
|
b2395a82
|
2013-09-04T18:49:10
|
|
Only use callbacks when -n or -v in add example.
|
|
|
04fd2665
|
2013-09-04T18:44:12
|
|
Move statement after declarations in add example.
|
|
|
9a0e42c6
|
2013-09-04T18:43:14
|
|
Remove unnececery arguments priting in add example.
|
|
|
813937ce
|
2013-09-04T18:42:47
|
|
Better usage info in add example.
|
|
|
24d23220
|
2013-09-04T18:34:03
|
|
Add -u option to add example.
|
|
|
e8fa14d3
|
2013-09-03T19:11:50
|
|
Supported options information in add example.
|
|
|
62020aa8
|
2013-09-02T02:01:40
|
|
Adding add example.
|
|
|
60ee53df
|
2013-09-03T15:14:04
|
|
Split examples CMakeLists.txt
Also, this converts the examples/CMakeLists.txt from explicitly
listing to just globbing for all the individual C files.
|
|
|
255836dd
|
2013-09-01T18:35:39
|
|
Adding credentials callback to ls-remote and fetch too.
|
|
|
d6d52348
|
2013-09-01T18:30:11
|
|
Removing unneeded code duplication in ls-remote.c
|
|
|
0ea41445
|
2013-08-16T15:03:15
|
|
Improve isolation of new test from user environs
|
|
|
944c1589
|
2013-08-16T14:49:38
|
|
Add example like "git init"
|
|
c3ae0473
|
2013-07-27T05:31:28
|
|
Fix -n bug; default to all ancestors
|
|
|
bc6f0839
|
2013-07-05T15:22:21
|
|
Add a bunch more features to log example
|
|
|
a8b5f116
|
2013-07-03T17:00:50
|
|
Fix example/log.c pathspec handling of merges
This fixes the way the example log program decides if a merge
commit should be shown when a pathspec is given. Also makes it
easier to use the pathspec API to just check "does a tree match
anything in the pathspec" without allocating a match list.
|
|
|
733c4f3a
|
2013-07-03T15:12:14
|
|
more examples/log.c bug fixing
|
|
|
5a169711
|
2013-07-03T15:08:54
|
|
fix bug with order args and no revision
|
|
|
2b3bd8ec
|
2013-07-03T14:53:39
|
|
Fix example/log.c minor diffs with git log
|
|
|
f44c4fa1
|
2013-07-01T15:41:32
|
|
Add basic commit formatting to log output
|
|
|
8ba0ff69
|
2013-06-25T15:39:44
|
|
rev-parse example
|