Commit Graph

4488 Commits

Author SHA1 Message Date
Vicent Marti
cbda09d00b git_revision -> git_revspec 2013-04-15 23:40:46 +02:00
Vicent Marti
36c2dfed69 Is this crazy? 2013-04-15 23:32:40 +02:00
Vicent Marti
d064c74794 Merge remote-tracking branch 'ben/unified-revparse' into development 2013-04-15 23:18:24 +02:00
Ben Straub
201566539f Clean up minor details 2013-04-15 13:29:40 -07:00
Ben Straub
5961d5ea7f Clean up example code. 2013-04-15 12:10:18 -07:00
Ben Straub
299a224be1 Change git_revparse to output git_object pointers
This will probably prevent many lookup/free
operations in calling code.
2013-04-15 12:00:04 -07:00
Ben Straub
2ebc3c66c2 Redeploy git_revparse_single. 2013-04-15 11:57:24 -07:00
Ben Straub
4291ad0781 Reintroduce git_revparse_single. 2013-04-15 11:42:34 -07:00
Vicent Martí
77849ebf1e Merge pull request #1468 from carlosmn/obsd-sparc64
OpenBSD & sparc64 fixes
2013-04-15 11:19:12 -07:00
Carlos Martín Nieto
4a3f69b5b2 refdb tests: use the right variable size
Mixing int and size_t through pointers leads to problems
in big-endian machines.
2013-04-15 20:20:14 +02:00
Carlos Martín Nieto
872ca1d302 Fix compilation on OpenBSD 2013-04-15 20:00:42 +02:00
Vicent Martí
2d2260da41 Merge pull request #1467 from carlosmn/commit-parse
commit: correctly detect the start of the commit message
2013-04-15 06:11:29 -07:00
Carlos Martín Nieto
0efae3b22e commit: correctly detect the start of the commit message
The end of the header is signaled by to consecutive LFs and the commit
message starts immediately after. Jumping over LFs at the start of the
message is a bug and leads to creating different commits if
when rebuilding history.

This also fixes an empty commit message being returned as "\n".
2013-04-15 12:24:08 +02:00
Russell Belfer
041ed367ab Merge pull request #1464 from ethomson/refdb_free
dec refcount on refdb instead of always freeing
2013-04-12 10:48:23 -07:00
Edward Thomson
7ebc249c22 dec refcount on refdb instead of always freeing 2013-04-12 11:21:47 -05:00
Vicent Martí
ea8bac37b0 Merge pull request #1450 from carlosmn/branch-upstream
Branch upstream configuration
2013-04-11 06:34:59 -07:00
Carlos Martín Nieto
d59942c2ab branch: add more upstream configuration management
Add functions to set and unset the upstream configuration to
complement the getter we already have.
2013-04-11 12:27:25 +02:00
Vicent Martí
acd4077182 Merge pull request #1367 from yorah/fix/pathspecs_behaviour
Correctly return matched pathspec when passing "*" or "."
2013-04-11 03:03:02 -07:00
yorah
0d32f39eb8 Notify '*' pathspec correctly when diffing
I also moved all tests related to notifying in their own file.
2013-04-11 09:59:26 +02:00
Vicent Marti
575a54db85 object: Export git_object_dup 2013-04-10 16:56:32 +02:00
Vicent Martí
90431f1b80 Merge pull request #1424 from phkelley/efficient_push
Reduce the number of unnecessary objects in pushed packs
2013-04-10 08:33:33 -07:00
Vicent Marti
0d3ccf0b28 examples: Don't print weird characters 2013-04-10 16:41:05 +02:00
Vicent Martí
e9b7ff602b Merge pull request #1460 from arrbee/fix-dirty-submodules-diff
Submodule diff tests and fixes
2013-04-09 15:15:18 -07:00
Russell Belfer
ad26434b3b Tests and more fixes for submodule diffs
This adds tests for diffs with submodules in them and (perhaps
unsurprisingly) requires further fixes to be made.  Specifically,
this fixes:

- when considering if a submodule is dirty in the workdir, it was
  being treated as dirty even if only the index was dirty.
- git_diff_patch_to_str (and git_diff_patch_print) were "printing"
  the headers for files (and submodules) that were unmodified or
  had no meaningful content.
- added comment to previous fix and removed unneeded parens.
2013-04-09 14:52:32 -07:00
Russell Belfer
9da187e83d Fix clang warnings and improve checks 2013-04-09 11:40:00 -07:00
Linquize
94750e8af2 Fix submodule dirty states not showing if submodules comes before files, or there are only dirty submodules but no changed files
GIT_DIFF_PATCH_DIFFABLE was not set, so the diff content was not shown

When submodule is dirty, the hash may be the same, but the length is different because -dirty is appended

We can therefore compare the length or hash
2013-04-09 10:51:35 -07:00
Vicent Martí
fc12a6b545 Merge pull request #1458 from maxpow4h/patch-1
Updated link to Haskell bindings
2013-04-08 23:28:27 -07:00
Ben Straub
ec7e240ba4 Add rev-list example to makefiles 2013-04-09 05:07:12 +04:00
Ben Straub
1aa21fe3b8 Deprecate git_revparse_single and _rangelike 2013-04-09 05:07:04 +04:00
Maxwell Swadling
7d5b0f8b1f Updated link to Haskell bindings
The old one hasn't been updated in a long time. This one is current.
2013-04-09 09:28:40 +10:00
Ben Straub
8480eef7ee Implement unified git_revparse 2013-04-08 16:36:11 +04:00
Ben Straub
4d13d07ab2 Propose unified rev-parse API 2013-04-08 16:35:09 +04:00
Vicent Marti
812e5aea59 test: Add missing NULLs 2013-04-07 07:23:08 +02:00
Vicent Marti
d9ecaf8c6f Merge remote-tracking branch 'gnprice/revwalk' into development 2013-04-07 07:22:38 +02:00
Greg Price
2e2332857d examples: a test, for rev-list
This test file could probably be improved by a framework like
the one in git.git:t/, or by using a language like Python instead
of shell.

The other examples would benefit from tests too.  Probably best
to settle on a framework to write them in, then add more tests.

Signed-off-by: Greg Price <price@mit.edu>
2013-04-06 20:51:16 -07:00
Greg Price
8f7f5e5543 examples: rev-list
This demonstrates parts of the interface for specifying revisions that
Git users are familiar with from 'git rev-list', 'git log', and other
Git commands.  A similar query interface is used in out-of-core
command-line programs that browse a Git repo (like 'tig'), and may be
useful for an 'advanced search' interface in GUI or web applications.

In this version, we parse all the query modifiers we can support with
the existing logic in revwalk: basic include/exclude commits, and the
ordering flags.  More logic will be required to support '--grep',
'--author', the pickaxe '-S', etc.

Signed-off-by: Greg Price <price@mit.edu>
2013-04-06 20:51:16 -07:00
Greg Price
af079d8bf6 revwalk: Parse revision ranges
All the hard work is already in revparse.

Signed-off-by: Greg Price <price@mit.edu>
2013-04-06 20:51:16 -07:00
Greg Price
b208d90022 revparse: Parse range-like syntax
Signed-off-by: Greg Price <price@mit.edu>
2013-04-06 20:51:16 -07:00
Vicent Martí
2274483727 Merge pull request #1456 from ben/fix-general-example
Fix the general.c example to run against testrepo.git
2013-04-04 11:46:54 -07:00
Ben Straub
f8591e519a General example: run against testrepo.git
Fixes #1455
2013-04-04 11:44:50 -07:00
Vicent Martí
432b8c11b8 Merge pull request #1453 from ethomson/refdb_export
Properly GIT_EXPORT git_reference__alloc
2013-04-02 17:09:35 -07:00
Edward Thomson
c869e26878 export git_reference__alloc 2013-04-02 18:57:42 -05:00
Ben Straub
734aa82642 Merge pull request #1452 from nulltoken/fix/branch_doc
branch: Fix git_branch_create() documentation
2013-04-01 13:28:08 -07:00
nulltoken
b08c317346 branch: Fix git_branch_create() documentation 2013-04-01 22:01:13 +02:00
Vicent Martí
08283cbdb8 Merge pull request #1448 from phkelley/development
Avoid pre-Win7 WinHTTP self-redirect quirk
2013-04-01 07:12:49 -07:00
Philip Kelley
b39f969732 Fix whitespace in src/win32/version.h 2013-03-31 23:04:14 -04:00
Philip Kelley
5c5eeba6fd Add git_has_win32_version helper 2013-03-31 22:22:33 -04:00
Greg Price
2932c8826a revwalk: refactor tests a bit
Signed-off-by: Greg Price <price@mit.edu>
2013-03-31 15:33:22 -07:00
Greg Price
06e6eab0e2 revwalk tests: better diagram of example repo
The purported command output was already inaccurate, as the refs
aren't where it shows.  In any event, the labels a reader of this
file really needs are the indices used in commit_sorting_*, to make
it possible to understand them by referring directly from those
arrays to the diagram rather than from the index arrays, to commit_ids,
to the diagram.  Add those.

Signed-off-by: Greg Price <price@mit.edu>
2013-03-31 15:33:22 -07:00
Greg Price
804c5f5627 Fix puzzling doc comment
Signed-off-by: Greg Price <price@mit.edu>
2013-03-31 15:33:22 -07:00