delta/libgit2.git/src, branch bug/status_case

Merge pull request #1688 from arrbee/submodule-load-ignore-orphaned-head

2013-06-28T05:48:46+00:00

Test submodules with empty index or orphaned head

Test submodules with empty index or orphaned head

2013-06-28T05:29:05+00:00

In both of these cases, the submodule data should still be loaded
just (obviously) without the data that comes from either the index
or the HEAD.

This fixes a bug in the orphaned head case.

Fix bug marking submodule diffs as unmodified

2013-06-27T14:38:27+00:00

There was a bug where submodules whose HEAD had not been moved
were being marked as having an UNMODIFIED delta record instead
of being left MODIFIED.  This fixes that and fixes the tests to
notice if a submodule has been incorrectly marked as UNMODIFIED.

Merge pull request #1681 from arthurschreiber/patch-1

2013-06-25T23:36:50+00:00

Prefer younger merge bases over older ones.

Merge pull request #1678 from arthurschreiber/unbreak-local-ls-after-disconnect

2013-06-25T17:42:38+00:00

Unbreak git_remote_ls on a local transport after disconnecting.

Prefer younger merge bases over older ones.

2013-06-25T16:36:37+00:00

git-core prefers younger merge bases over older ones in case that multiple valid merge bases exists.

Correctly handle junctions

2013-06-25T14:46:06+00:00

A junction has S_IFDIR | S_IFLNK set, however, only one makes sense.

Signed-off-by: Sven Strickroth

Revert "Work around reparse point stat issues"

2013-06-25T14:43:15+00:00

This reverts commit 32c12ea6a9cafd76a746af2e2be9366c95752f5b.

Make sure we don't leak memory again.

2013-06-25T08:17:55+00:00

Unbreak git_remote_ls on a local transport after disconnecting.

2013-06-25T07:04:04+00:00