diff options
| author | Russell Belfer <rb@github.com> | 2013-06-21 11:20:54 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-06-21 11:20:54 -0700 |
| commit | 36fd9e30651cf0d6b0ef58452ba2974a3544d4d1 (patch) | |
| tree | 0c39eb9beb26079d3d820d8dec0324a96956d15c /include/git2/checkout.h | |
| parent | dacce80b128501e9821f254c2edb1e93906eac0b (diff) | |
| download | libgit2-36fd9e30651cf0d6b0ef58452ba2974a3544d4d1.tar.gz | |
Fix checkout of modified file when missing from wd
This fixes the checkout case when a file is modified between the
baseline and the target and yet missing in the working directory.
The logic for that case appears to have been wrong.
This also adds a useful checkout notify callback to the checkout
test helpers that will count notifications and also has a debug
mode to visualize what checkout thinks that it's doing.
Diffstat (limited to 'include/git2/checkout.h')
| -rw-r--r-- | include/git2/checkout.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h index 6798bf31c..f49e87566 100644 --- a/include/git2/checkout.h +++ b/include/git2/checkout.h @@ -183,6 +183,8 @@ typedef enum { GIT_CHECKOUT_NOTIFY_UPDATED = (1u << 2), GIT_CHECKOUT_NOTIFY_UNTRACKED = (1u << 3), GIT_CHECKOUT_NOTIFY_IGNORED = (1u << 4), + + GIT_CHECKOUT_NOTIFY_ALL = 0x0FFFFu } git_checkout_notify_t; /** Checkout notification callback function */ |