Edward Thomson
0175971e91
stash: const up conflict params
2015-06-29 21:23:09 +00:00
Edward Thomson
ee6eed5188
stash: test we apply using reflog-like indices
2015-06-26 11:48:48 -04:00
Edward Thomson
b7f5cb8dd7
stash: stage new files when unstashing them
...
Files that were new (staged additions) in the stash tree should
be staged when unstashing, even when not applying the index.
2015-06-25 18:34:38 -04:00
Edward Thomson
82b1c93d08
stash: don't allow apply with staged changes
2015-06-25 18:34:36 -04:00
Edward Thomson
1db6a0ab52
stash apply: add a newly staged file to tests
2015-06-25 18:33:56 -04:00
Pierre-Olivier Latour
07ea3a7f57
Fixed index being double-freed in stash tests
2015-06-20 10:57:03 -07:00
Pierre-Olivier Latour
9f3c18e2ac
Fixed build warnings on Xcode 6.1
2015-06-02 11:49:38 -07:00
Edward Thomson
885b94aac0
Rename GIT_EMERGECONFLICT to GIT_ECONFLICT
...
We do not error on "merge conflicts"; on the contrary, merge conflicts
are a normal part of merging. We only error on "checkout conflicts",
where a change exists in the index or the working directory that would
otherwise be overwritten by performing the checkout.
This *may* happen during merge (after the production of the new index
that we're going to checkout) but it could happen during any checkout.
2015-05-29 09:55:09 -04:00
Carlos Martín Nieto
3e529e9d2d
Fix a few leaks
...
The interesting one is the notification macro, which was returning
directly on a soft-abort instead of going through the cleanup.
2015-05-13 16:40:18 +02:00
Edward Thomson
4ea3eebf4b
stash_apply: provide progress callbacks
2015-05-11 14:12:42 -04:00
Edward Thomson
19c80a6fd1
stash_apply: provide its own options structure
2015-05-11 14:12:39 -04:00
Edward Thomson
249616685e
stash: test checkout notify callbacks
2015-05-11 14:12:35 -04:00
Edward Thomson
f78bb2afb3
stash: return GIT_EMERGECONFLICT on merge conflict
2015-05-11 14:12:27 -04:00
Edward Thomson
f0957589ee
stash: refactor to use merge_iterators
2015-05-11 14:12:19 -04:00
Edward Thomson
d0dd3fcee7
stash apply: check out a tree, not piecewise
2015-05-11 14:12:12 -04:00
Pierre-Olivier Latour
bf8dd3f53d
Added git_stash_apply() and git_stash_pop() APIs
2015-05-11 14:11:53 -04:00
