delta/libgit2.git/src/checkout.c, branch cmn/peeling-errors github.com: libgit2/libgit2.git Fixed a couple Clang warnings 2014-11-09T23:18:48+00:00 Pierre-Olivier Latour pol@mac.com 2014-11-08T23:09:25+00:00 692c040843dee45287d87ed81d4a1bd3684f5c97 






iterator: submodules are determined by an index or tree
2014-11-07T07:33:27+00:00

Carlos Martín Nieto
cmn@dwim.me

2014-11-06T15:16:46+00:00

62a617dc683c1e73eebd0e1b6209f76748e67ed4

We cannot know from looking at .gitmodules whether a directory is a
submodule or not. We need the index or tree we are comparing against to
tell us. Otherwise we have to assume the entry in .gitmodules is stale
or otherwise invalid.

Thus we pass the index of the repository into the workdir iterator, even
if we do not want to compare against it. This follows what git does,
which even for `git diff <tree>`, it will consider staged submodules as
such.





We cannot know from looking at .gitmodules whether a directory is a
submodule or not. We need the index or tree we are comparing against to
tell us. Otherwise we have to assume the entry in .gitmodules is stale
or otherwise invalid.

Thus we pass the index of the repository into the workdir iterator, even
if we do not want to compare against it. This follows what git does,
which even for `git diff <tree>`, it will consider staged submodules as
such.







checkout_index: Remove stage 0 when checking out conflicts
2014-11-06T23:50:10+00:00

Edward Thomson
ethomson@microsoft.com

2014-11-06T23:49:37+00:00

2d24816b4611a7392617855f497f81f385092f34












checkout_index: remove conflicts when checking out new files
2014-11-06T23:49:57+00:00

Edward Thomson
ethomson@microsoft.com

2014-11-06T19:40:21+00:00

9f664347ff74716dc35ff0bd9a1a87606ae29cf0












config: remove the refresh function and backend field
2014-10-23T17:05:02+00:00

Carlos Martín Nieto
cmn@dwim.me

2014-10-23T17:05:02+00:00

55cb4999720f46eddb97e25e7ddc6ac068dd0bae

We have been refreshing on read and write for a while now, so
git_config_refresh() is at best a no-op, and might just end up wasting
cycles.





We have been refreshing on read and write for a while now, so
git_config_refresh() is at best a no-op, and might just end up wasting
cycles.







Don't copy buffer in checkout unless needed
2014-10-13T17:36:20+00:00

Edward Thomson
ethomson@microsoft.com

2014-10-12T01:38:22+00:00

6a26488f8b162ad0b91a8ad52a6ed380939cdd2f












Ensure filters (i.e. CRLF) are applied when checking out conflict content
2014-10-13T17:36:18+00:00

Jacques Germishuys
jacquesg@striata.com

2014-10-10T11:22:11+00:00

5e2cf2ca2c639b142776709df83b7fcbae0e4a70












Merge remote-tracking branch 'origin/master' into fix-git-status-list-new-unreadable-folder
2014-07-22T05:08:24+00:00

Alan Rogers
alan@github.com

2014-07-22T05:08:24+00:00

7d0ab0fae04015e0bc66ff16beae495f13969b10












git_checkout_index: checkout other indexes
2014-07-01T21:32:15+00:00

Edward Thomson
ethomson@microsoft.com

2014-05-23T21:50:51+00:00

967f5a76b1c89f1f93840407fd2afd1e8005dad6

git_checkout_index can now check out other git_index's (that are not
necessarily the repository index).  This allows checkout_index to use
the repository's index for stat cache information instead of the index
data being checked out.  git_merge and friends now check out their
indexes directly instead of trying to blend it into the running index.





git_checkout_index can now check out other git_index's (that are not
necessarily the repository index).  This allows checkout_index to use
the repository's index for stat cache information instead of the index
data being checked out.  git_merge and friends now check out their
indexes directly instead of trying to blend it into the running index.







Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.
2014-05-20T13:57:40+00:00

Alan Rogers
alan@github.com

2014-05-20T13:57:40+00:00

61bef72dc35c593e632dc2008c4eec271a264869