]> git.proxmox.com Git - libgit2.git/log
libgit2.git
11 years agodefine "long name" in git_reference_name_to_id
Li Xuanji [Tue, 21 May 2013 13:35:58 +0000 (21:35 +0800)]
define "long name" in git_reference_name_to_id

11 years agoMerge pull request #1596 from grimreaper/development
Edward Thomson [Mon, 20 May 2013 20:53:00 +0000 (13:53 -0700)]
Merge pull request #1596 from grimreaper/development

Initialize loose_deleted before it is used for a check later on.

11 years agoInitialize loose_deleted before it is used for a check later on.
Eitan Adler [Sun, 19 May 2013 05:41:00 +0000 (01:41 -0400)]
Initialize loose_deleted before it is used for a check later on.

11 years agoMerge pull request #1568 from nulltoken/topic/revparse_ext
Russell Belfer [Thu, 16 May 2013 20:13:28 +0000 (13:13 -0700)]
Merge pull request #1568 from nulltoken/topic/revparse_ext

Introduce git_revparse_ext()

11 years agorevparse: Make revparse_ext() return git_reference from names as well
nulltoken [Fri, 10 May 2013 18:15:57 +0000 (20:15 +0200)]
revparse: Make revparse_ext() return git_reference from names as well

11 years agorevparse: Introduce git_revparse_ext()
nulltoken [Thu, 9 May 2013 14:42:39 +0000 (16:42 +0200)]
revparse: Introduce git_revparse_ext()

Expose a way to retrieve, along with the target git_object, the reference
pointed at by some revparse expression (`@{<-n>}` or
`<branchname>@{upstream}` syntax).

11 years agorevparse: Simplify temporary reference freeing
nulltoken [Thu, 9 May 2013 14:52:04 +0000 (16:52 +0200)]
revparse: Simplify temporary reference freeing

11 years agoMerge pull request #1558 from bmorganpa/ssh_transport
Vicent Martí [Thu, 16 May 2013 18:35:02 +0000 (11:35 -0700)]
Merge pull request #1558 from bmorganpa/ssh_transport

SSH Transport

11 years agoMerge pull request #1590 from arrbee/examples-like-git
Vicent Martí [Thu, 16 May 2013 18:10:42 +0000 (11:10 -0700)]
Merge pull request #1590 from arrbee/examples-like-git

Add cat-file to examples (with some public API improvements)

11 years agoMerge pull request #1591 from arrbee/reorder-reuc-read-for-safety
Vicent Martí [Thu, 16 May 2013 18:10:13 +0000 (11:10 -0700)]
Merge pull request #1591 from arrbee/reorder-reuc-read-for-safety

Ensure reuc vector is always valid

11 years agoEnsure reuc vector is always valid
Russell Belfer [Thu, 16 May 2013 18:03:55 +0000 (11:03 -0700)]
Ensure reuc vector is always valid

In theory, if there was a problem reading the REUC data, the
read_reuc() routine could have left uninitialized and invalid
data in the git_index vector.  This moves the line that inserts a
new entry into the vector down to the bottom of the routine so we
know all the content is already valid.  Also, per @linquize, this
uses calloc to ensure no uninitialized data.

11 years agoMerge pull request #1574 from linquize/calloc
Russell Belfer [Thu, 16 May 2013 18:02:30 +0000 (11:02 -0700)]
Merge pull request #1574 from linquize/calloc

Use calloc() for safety

11 years agoMake examples/diff.c compile vs threadsafe library
Russell Belfer [Thu, 16 May 2013 17:43:10 +0000 (10:43 -0700)]
Make examples/diff.c compile vs threadsafe library

11 years agoAdd cat-file example and increase const use in API
Russell Belfer [Thu, 16 May 2013 17:38:27 +0000 (10:38 -0700)]
Add cat-file example and increase const use in API

This adds an example implementation that emulates git cat-file.
It is a convenient and relatively simple example of getting data
out of a repository.

Implementing this also revealed that there are a number of APIs
that are still not using const pointers to objects that really
ought to be.  The main cause of this is that `git_vector_bsearch`
may need to call `git_vector_sort` before doing the search, so a
const pointer to the vector is not allowed.  However, for tree
objects, with a little care, we can ensure that the vector of
tree entries is always sorted and allow lookups to take a const
pointer.  Also, the missing const in commit objects just looks
like an oversight.

11 years agocalloc() to initialize memory
Linquize [Thu, 16 May 2013 13:08:55 +0000 (21:08 +0800)]
calloc() to initialize memory

11 years agoMerge pull request #1586 from jamill/fetch_fix
Vicent Martí [Thu, 16 May 2013 11:41:05 +0000 (04:41 -0700)]
Merge pull request #1586 from jamill/fetch_fix

Fetch should not fail when remote HEAD reference is not present locally

11 years agoMerge pull request #1579 from arrbee/index-entry-dup-and-free
Vicent Martí [Wed, 15 May 2013 23:35:47 +0000 (16:35 -0700)]
Merge pull request #1579 from arrbee/index-entry-dup-and-free

Index entry dup and free

11 years agoUpdate index.h docs
Russell Belfer [Wed, 15 May 2013 23:25:11 +0000 (16:25 -0700)]
Update index.h docs

Move the git_index_entry to the very top, since it provides the
main structure that needs to be understood by the reader, then
move the bitmasks for the flags and the flags_extended under that
since they are details for looking at particular fields of the
structure.

11 years agoRemove entry dup/free functions and fix comments
Russell Belfer [Wed, 15 May 2013 16:24:51 +0000 (09:24 -0700)]
Remove entry dup/free functions and fix comments

This removes the functions to duplicate and free copies of a
git_index_entry and updates the comments to explain that you
should just use the public definition of the struct as needed.

11 years agoAdd APIs to dup and free git_index_entrys
Russell Belfer [Mon, 13 May 2013 23:09:33 +0000 (16:09 -0700)]
Add APIs to dup and free git_index_entrys

This adds git_index_entry_dup to make a copy of an existing entry
and git_index_entry_free to release the memory of the copy.  It
also updates the documentation for git_index_get_bypath and
git_index_get_byindex to make it clear that the returned structure
should *not* be modified.

11 years agoImprove docs for git_index_entry flag masks
Russell Belfer [Mon, 13 May 2013 23:07:29 +0000 (16:07 -0700)]
Improve docs for git_index_entry flag masks

The constants for extracting data from git_index_entry flags and
flags_extended are not named in a way that makes it easy to know
where to use each one.  This improves the docs for the flags (and
slightly reorganizes them), so it should be more obvious.

11 years agoMerge pull request #1588 from arrbee/fixes-for-checkout-and-diff
Vicent Martí [Wed, 15 May 2013 22:47:46 +0000 (15:47 -0700)]
Merge pull request #1588 from arrbee/fixes-for-checkout-and-diff

Bug fixes for checkout and diff

11 years agoMerge pull request #1578 from nulltoken/fix/whitespaces
Vicent Martí [Wed, 15 May 2013 22:47:20 +0000 (15:47 -0700)]
Merge pull request #1578 from nulltoken/fix/whitespaces

Fix trailing whitespaces

11 years agoUse GIT_IDXENTRY_STAGE macro
Russell Belfer [Wed, 15 May 2013 22:23:33 +0000 (15:23 -0700)]
Use GIT_IDXENTRY_STAGE macro

Since I added the GIT_IDXENTRY_STAGE macro to extract the stage
from a git_index_entry, we probably don't need an internal inline
function to do the same thing.

11 years agoImprove robustness of diff rename detection
Russell Belfer [Wed, 15 May 2013 21:58:26 +0000 (14:58 -0700)]
Improve robustness of diff rename detection

Under some strange circumstances, diffs can end up listing files
that we can't actually open successfully.  Instead of aborting
the git_diff_find_similar, this makes it so that those files just
won't be considered as valid rename/copy targets instead.

11 years agoFix checkout of submodules with no .gitmodules
Russell Belfer [Wed, 15 May 2013 21:54:02 +0000 (14:54 -0700)]
Fix checkout of submodules with no .gitmodules

It is possible for there to be a submodule in a repository with
no .gitmodules file (for example, if the user forgot to commit
the .gitmodules file).  In this case, core Git will just create
an empty directory as a placeholder for the submodule but
otherwise ignore it.  We were generating an error and stopping
the checkout.  This makes our behavior match that of core git.

11 years agoRemove old symlinks before updating
Russell Belfer [Wed, 15 May 2013 21:52:12 +0000 (14:52 -0700)]
Remove old symlinks before updating

Unlike blob updates, symlink updates cannot be done "in place"
writing over an old symlink.  This means that in checkout when we
realize that we can safely update a symlink, we still need to
remove the old one before writing the new.

11 years agoFix diff crash when last item is untracked dir
Russell Belfer [Wed, 15 May 2013 21:50:05 +0000 (14:50 -0700)]
Fix diff crash when last item is untracked dir

When the last item in a diff was an untracked directory that only
contained ignored items, the loop to scan the contents would run
off the end of the iterator and dereference a NULL pointer.  This
includes a test that reproduces the problem and a fix.

11 years agoFix trailing whitespaces
nulltoken [Mon, 13 May 2013 19:57:37 +0000 (21:57 +0200)]
Fix trailing whitespaces

11 years agoFetch should not fail when remote HEAD reference is not present locally
Jameson Miller [Wed, 15 May 2013 18:44:35 +0000 (14:44 -0400)]
Fetch should not fail when remote HEAD reference is not present locally

11 years agoAdded GITERR_CHECK_ALLOC
Brad Morgan [Wed, 15 May 2013 16:51:40 +0000 (12:51 -0400)]
Added GITERR_CHECK_ALLOC

11 years agoChanged case of FindLibSSH2.cmake to FindLIBSSH2.cmake
Brad Morgan [Wed, 15 May 2013 16:49:15 +0000 (12:49 -0400)]
Changed case of FindLibSSH2.cmake to FindLIBSSH2.cmake

11 years agoRenamed FindLibSSH2.cmake
Brad Morgan [Wed, 15 May 2013 16:48:43 +0000 (12:48 -0400)]
Renamed FindLibSSH2.cmake

11 years agoAdded GITERR_CHECK_ALLOC
Brad Morgan [Wed, 15 May 2013 16:46:33 +0000 (12:46 -0400)]
Added GITERR_CHECK_ALLOC

11 years agoReworked git_cred_ssh_keyfile_passphrase_new method
Brad Morgan [Wed, 15 May 2013 16:44:51 +0000 (12:44 -0400)]
Reworked git_cred_ssh_keyfile_passphrase_new method

11 years agoAdded error check
Brad Morgan [Wed, 15 May 2013 16:41:16 +0000 (12:41 -0400)]
Added error check

11 years agoCleanup
Brad Morgan [Wed, 15 May 2013 16:38:40 +0000 (12:38 -0400)]
Cleanup

11 years agosignature: Lenient when dupping, strict when creating
Vicent Marti [Wed, 15 May 2013 15:51:57 +0000 (17:51 +0200)]
signature: Lenient when dupping, strict when creating

11 years agoMerge pull request #1583 from linquize/whitespace
Vicent Martí [Wed, 15 May 2013 15:31:37 +0000 (08:31 -0700)]
Merge pull request #1583 from linquize/whitespace

Unify whitespaces to tabs

11 years agoUnify whitespaces to tabs
Linquize [Wed, 15 May 2013 12:26:55 +0000 (20:26 +0800)]
Unify whitespaces to tabs

11 years agoExtend valgrind suppressions on Mac
Russell Belfer [Tue, 14 May 2013 23:39:19 +0000 (16:39 -0700)]
Extend valgrind suppressions on Mac

11 years agoMerge pull request #1580 from carlosmn/cmake-describe
Russell Belfer [Tue, 14 May 2013 23:24:16 +0000 (16:24 -0700)]
Merge pull request #1580 from carlosmn/cmake-describe

CMake: vendor strings

11 years agoMerge pull request #1582 from dmgctrl/checkout_symlink_fix
Russell Belfer [Tue, 14 May 2013 22:05:52 +0000 (15:05 -0700)]
Merge pull request #1582 from dmgctrl/checkout_symlink_fix

Create directory for symlink before creating symlink

11 years agoMerge pull request #1581 from nulltoken/fix/leaks
Russell Belfer [Tue, 14 May 2013 22:04:16 +0000 (15:04 -0700)]
Merge pull request #1581 from nulltoken/fix/leaks

Fix some memory leaks

11 years agoCMake: allow appending a string to the library filename
Carlos Martín Nieto [Tue, 14 May 2013 21:09:26 +0000 (23:09 +0200)]
CMake: allow appending a string to the library filename

This helps us install multiple versions of the library side-by-side.

11 years agoCreate directory for symlink before creating symlink
Brad Morgan [Tue, 14 May 2013 20:03:09 +0000 (16:03 -0400)]
Create directory for symlink before creating symlink

11 years agoFix some memory leaks
nulltoken [Tue, 14 May 2013 19:54:26 +0000 (21:54 +0200)]
Fix some memory leaks

11 years agoCMake: don't try to use bundled zlib when the system's path is in the cache
Carlos Martín Nieto [Sun, 12 May 2013 13:35:02 +0000 (15:35 +0200)]
CMake: don't try to use bundled zlib when the system's path is in the cache

The code surrounding zlib bundling did not take into consideration
that ZLIB_LIBRARY gets cached, and assumed that FIND(ZLIB) would
always set ZLIB_FOUND, which does not hold true, as this variable
signifies that we have found the package and had to look at the
system, as its location was not cached.

Only use the bundled sources if the external zlib is neither
newly-found nor cached.

11 years agoMerge pull request #1575 from arrbee/ref-iterator-early-exit
Carlos Martín Nieto [Sat, 11 May 2013 14:48:31 +0000 (07:48 -0700)]
Merge pull request #1575 from arrbee/ref-iterator-early-exit

Fix refdb iteration early termination bug

11 years agoFix refdb iteration early termination bug
Russell Belfer [Sat, 11 May 2013 13:42:25 +0000 (06:42 -0700)]
Fix refdb iteration early termination bug

There was a problem found in the Rugged test suite where the
refdb_fs_backend__next function could exit too early in some
very specific hashing patterns for packed refs.  This ports
the Rugged test to libgit2 and then fixes the bug.

11 years agoMerge pull request #1569 from linquize/msvc-sdl
Vicent Martí [Sat, 11 May 2013 12:15:00 +0000 (05:15 -0700)]
Merge pull request #1569 from linquize/msvc-sdl

Fix broken build when MSVC SDL checks is enabled

11 years agoFix broken build when MSVC SDL checks is enabled
Linquize [Fri, 10 May 2013 13:42:22 +0000 (21:42 +0800)]
Fix broken build when MSVC SDL checks is enabled

11 years agoMerge pull request #1385 from carlosmn/refs-iter
Edward Thomson [Sat, 11 May 2013 09:42:49 +0000 (02:42 -0700)]
Merge pull request #1385 from carlosmn/refs-iter

Introduce a refs iterator

11 years agoIntroduce a glob-filtering iterator
Carlos Martín Nieto [Sat, 4 May 2013 16:06:14 +0000 (18:06 +0200)]
Introduce a glob-filtering iterator

If the backend doesn't provide support for it, the matching is done in
refdb on top of a normal iterator.

11 years agoMove a couple more functions to use iterators
Carlos Martín Nieto [Sat, 4 May 2013 14:49:39 +0000 (16:49 +0200)]
Move a couple more functions to use iterators

11 years agorefs: remove the OID/SYMBOLIC filtering
Carlos Martín Nieto [Sat, 4 May 2013 14:32:58 +0000 (16:32 +0200)]
refs: remove the OID/SYMBOLIC filtering

Nobody should ever be using anything other than ALL at this level, so
remove the option altogether.

As part of this, git_reference_foreach_glob is now implemented in the
frontend using an iterator. Backends will later regain the ability of
doing the glob filtering in the backend.

11 years agorefs: implement _foreach with the iterator
Carlos Martín Nieto [Sat, 4 May 2013 14:03:17 +0000 (16:03 +0200)]
refs: implement _foreach with the iterator

11 years agoAdd iterator support to the testdb backend
Carlos Martín Nieto [Sat, 4 May 2013 13:57:44 +0000 (15:57 +0200)]
Add iterator support to the testdb backend

11 years agoRemove outdated test
Carlos Martín Nieto [Sat, 4 May 2013 13:54:57 +0000 (15:54 +0200)]
Remove outdated test

Selecting wether to list loose or packed references is not something
we want to support anymore, so remove a test for this.

11 years agoMake sure the ref iterator works in an repo without physical presence
Carlos Martín Nieto [Sat, 4 May 2013 13:16:55 +0000 (15:16 +0200)]
Make sure the ref iterator works in an repo without physical presence

11 years agorefdb_fs: don't crash when the repo doesn't have a path
Carlos Martín Nieto [Sat, 4 May 2013 13:03:32 +0000 (15:03 +0200)]
refdb_fs: don't crash when the repo doesn't have a path

11 years agorefs: introduce an iterator
Carlos Martín Nieto [Sat, 2 Mar 2013 18:31:03 +0000 (19:31 +0100)]
refs: introduce an iterator

This allows us to get a list of reference names in a loop instead of callbacks.

11 years agoMerge pull request #1571 from arrbee/what-if-ignorecase-lies
Vicent Martí [Fri, 10 May 2013 17:49:22 +0000 (10:49 -0700)]
Merge pull request #1571 from arrbee/what-if-ignorecase-lies

Improve ignore handling in git_status_file

11 years agoMerge pull request #1572 from arrbee/diff-patch-with-rename
Vicent Martí [Fri, 10 May 2013 17:47:08 +0000 (10:47 -0700)]
Merge pull request #1572 from arrbee/diff-patch-with-rename

Fix diff output for renames and copies

11 years agoMerge pull request #1573 from nulltoken/fix/leaks
Ben Straub [Fri, 10 May 2013 17:33:25 +0000 (10:33 -0700)]
Merge pull request #1573 from nulltoken/fix/leaks

Fix some memory leaks

11 years agoFix some memory leaks
nulltoken [Fri, 10 May 2013 10:02:17 +0000 (12:02 +0200)]
Fix some memory leaks

11 years agoFix diff output for renames and copies
Russell Belfer [Fri, 10 May 2013 16:32:42 +0000 (09:32 -0700)]
Fix diff output for renames and copies

If you use rename detection, the renamed and copied files would
not show any text diffs because the function that decides if
data should be loaded didn't know which sides of the diff to
load for those cases.

This adds a test that looks at the patch generated for diff
entries that are COPIED or RENAMED.

11 years agoImprove ignore handling in git_status_file
Russell Belfer [Fri, 10 May 2013 14:50:53 +0000 (07:50 -0700)]
Improve ignore handling in git_status_file

The git_status_file API was doing a hack to deal with files that
are inside ignored directories.  The status scan was not reporting
any file in this case, so git_status_file would attempt a final
"stat()" call, and return IGNORED if the file actually existed.

On case-insensitive filesystems where core.ignorecase is set
incorrectly, this magic check can "succeed" and report a file
as ignored when it should actually return ENOTFOUND.

Now that we have the GIT_STATUS_OPT_RECURSE_IGNORED_DIRS, we can
use that flag to make sure that git_status_file() will look into
ignored directories and eliminate the hack completely, so we give
the correct error.

11 years agoRemoved ifdef
Brad Morgan [Fri, 10 May 2013 13:40:14 +0000 (09:40 -0400)]
Removed ifdef

11 years agoclone: fix -Wmaybe-uninitialized warning
Michael Schubert [Fri, 10 May 2013 12:31:58 +0000 (14:31 +0200)]
clone: fix -Wmaybe-uninitialized warning

11 years agoMoved libssh2 sign callback into typedef
Brad Morgan [Thu, 9 May 2013 21:40:21 +0000 (17:40 -0400)]
Moved libssh2 sign callback into typedef

11 years agoChanged to use libssh2_channel_exec
Brad Morgan [Thu, 9 May 2013 21:37:42 +0000 (17:37 -0400)]
Changed to use libssh2_channel_exec

11 years agoRenaming
Brad Morgan [Thu, 9 May 2013 21:36:27 +0000 (17:36 -0400)]
Renaming

11 years agoMerge pull request #1566 from ethomson/ref_zero
Vicent Martí [Thu, 9 May 2013 16:08:44 +0000 (09:08 -0700)]
Merge pull request #1566 from ethomson/ref_zero

calloc refs instead of malloc'ing them

11 years agocalloc refs instead of malloc'ing them
Edward Thomson [Thu, 9 May 2013 15:44:44 +0000 (17:44 +0200)]
calloc refs instead of malloc'ing them

11 years agoMerge pull request #1563 from arrbee/doc-fix-repo-message
Vicent Martí [Thu, 9 May 2013 13:48:16 +0000 (06:48 -0700)]
Merge pull request #1563 from arrbee/doc-fix-repo-message

Fix git_repository_message docs

11 years agoFix git_repository_message docs
Russell Belfer [Thu, 9 May 2013 13:45:06 +0000 (06:45 -0700)]
Fix git_repository_message docs

This clarifies the docs for git_repository_message and also adds
to the tests to explicitly check NUL termination of data when the
output buffer is smaller than the message size.  There is a minor
behavior change so that a non-NULL output buffer will always be
NUL terminated (at length zero) if an error occurs.

11 years agoMerge pull request #1560 from carlosmn/ref-dwim
Vicent Martí [Thu, 9 May 2013 12:43:25 +0000 (05:43 -0700)]
Merge pull request #1560 from carlosmn/ref-dwim

Expose git_reference_dwim

11 years agoMerge pull request #1561 from arrbee/fix-windows-diff-eofnl
Vicent Martí [Thu, 9 May 2013 12:42:37 +0000 (05:42 -0700)]
Merge pull request #1561 from arrbee/fix-windows-diff-eofnl

Fix windows diff eofnl error

11 years agoFix dumb type in time comparison
Russell Belfer [Wed, 8 May 2013 05:45:01 +0000 (22:45 -0700)]
Fix dumb type in time comparison

11 years agoMerge pull request #1552 from carlosmn/config-helpers
Vicent Martí [Tue, 7 May 2013 22:09:11 +0000 (15:09 -0700)]
Merge pull request #1552 from carlosmn/config-helpers

Config helpers for global/xdg config files

11 years agoExpose git_reference_dwim
Carlos Martín Nieto [Tue, 7 May 2013 21:28:21 +0000 (23:28 +0200)]
Expose git_reference_dwim

Extract this function out of the rev-parse code to be able to DWIM a
reference instead of its target.

11 years agoconfig: convenience function to open global/xdg
Carlos Martín Nieto [Mon, 6 May 2013 22:10:02 +0000 (00:10 +0200)]
config: convenience function to open global/xdg

The rules for which one to open is a bit silly, so let's make it
easier for our users.

11 years agorepo: unconditionally create a global config backend
Carlos Martín Nieto [Mon, 6 May 2013 19:51:25 +0000 (21:51 +0200)]
repo: unconditionally create a global config backend

When a repository is initialised, we need to probe to see if there is
a global config to load. If this is not the case, the user isn't able
to write to the global config without creating the backend and adding
it themselves, which is inconvenient and overly complex.

Unconditionally create and add a backend for the global config file
regardless of whether it exists as a convenience for users.

To enable this, we allow creating backends to files that do not exist
yet, changing the semantics somewhat, and making some tests invalid.

11 years agoAdded ifdef
Brad Morgan [Tue, 7 May 2013 18:37:15 +0000 (14:37 -0400)]
Added ifdef

11 years agoMerge remote-tracking branch 'origin/development' into ssh_transport
Brad Morgan [Tue, 7 May 2013 18:30:35 +0000 (14:30 -0400)]
Merge remote-tracking branch 'origin/development' into ssh_transport

11 years agoAdded libssh2 cmake module
Brad Morgan [Tue, 7 May 2013 18:26:33 +0000 (14:26 -0400)]
Added libssh2 cmake module

11 years agoFixed compilation issues when libssh2 is missing
Brad Morgan [Tue, 7 May 2013 17:53:23 +0000 (13:53 -0400)]
Fixed compilation issues when libssh2 is missing

11 years agoAdded SSH public key authentication
Brad Morgan [Tue, 7 May 2013 17:43:10 +0000 (13:43 -0400)]
Added SSH public key authentication

11 years agoMerge pull request #1557 from carlosmn/tagopt
Vicent Martí [Tue, 7 May 2013 17:14:28 +0000 (10:14 -0700)]
Merge pull request #1557 from carlosmn/tagopt

remote: correctly interpret tagopt '--tags'

11 years agoFix win32 type warnings
Russell Belfer [Tue, 7 May 2013 16:59:53 +0000 (09:59 -0700)]
Fix win32 type warnings

11 years agoremote: correctly interpret tagopt '--tags'
Carlos Martín Nieto [Tue, 7 May 2013 14:01:22 +0000 (16:01 +0200)]
remote: correctly interpret tagopt '--tags'

When tagopt is set to '--tags', we should only take the default tags
refspec into account and ignore any configured ones.

Bring the code into compliance.

11 years agoMerge pull request #1556 from arrbee/diff-patch-fixes
Vicent Martí [Tue, 7 May 2013 15:00:44 +0000 (08:00 -0700)]
Merge pull request #1556 from arrbee/diff-patch-fixes

Diff patch bug fixes

11 years agoFix line numbering for patches with eofnl
Russell Belfer [Tue, 7 May 2013 14:15:39 +0000 (07:15 -0700)]
Fix line numbering for patches with eofnl

When a patch contained an eofnl change (i.e. the last line either
gained or lost a newline), the oldno and newno line number values
for the lines in the last hunk of the patch were not useful.  This
makes them behave in a more expected manner.

11 years agoImprove diff function docs
Russell Belfer [Tue, 7 May 2013 11:44:08 +0000 (04:44 -0700)]
Improve diff function docs

11 years agoMore tests for files with no newline at end
Russell Belfer [Tue, 7 May 2013 11:36:42 +0000 (04:36 -0700)]
More tests for files with no newline at end

11 years agoAdd GIT_DIFF_LINE_CONTEXT_EOFNL
Russell Belfer [Tue, 7 May 2013 11:32:17 +0000 (04:32 -0700)]
Add GIT_DIFF_LINE_CONTEXT_EOFNL

This adds a new line origin constant for the special line that
is used when both files end without a newline.

In the course of writing the tests for this, I was having problems
with modifying a file but not having diff notice because it was
the same size and modified less than one second from the start of
the test, so I decided to start working on nanosecond timestamp
support.  This commit doesn't contain the nanosecond support, but
it contains the reorganization of maybe_modified and the hooks so
that if the nanosecond data were being read by stat() (or rather
being copied by git_index_entry__init_from_stat), then the nsec
would be taken into account.

This new stuff could probably use some more tests, although there
is some amount of it here.

11 years agoMerge pull request #1551 from nvloff/set_upstream_local_branch
Carlos Martín Nieto [Tue, 7 May 2013 08:32:10 +0000 (01:32 -0700)]
Merge pull request #1551 from nvloff/set_upstream_local_branch

fix git_branch_set_upstream for local branches

11 years agoMerge pull request #1554 from sba1/sort-amiga-fix
Russell Belfer [Tue, 7 May 2013 07:31:40 +0000 (00:31 -0700)]
Merge pull request #1554 from sba1/sort-amiga-fix

Fixed qsort_r() problem when targeting AmigaOS.

11 years agoFixed qsort_r() problem when targeting AmigaOS.
Sebastian Bauer [Tue, 7 May 2013 07:15:12 +0000 (09:15 +0200)]
Fixed qsort_r() problem when targeting AmigaOS.

We fall back to the libgit2-provided insert sort as done for other
platforms.