зеркало из https://github.com/microsoft/git.git
Merge branch 'jn/cherry-pick-refresh-index'
* jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
This commit is contained in:
Коммит
5eee142c89
|
@ -547,6 +547,21 @@ static void prepare_revs(struct rev_info *revs)
|
|||
die("empty commit set passed");
|
||||
}
|
||||
|
||||
static void read_and_refresh_cache(const char *me)
|
||||
{
|
||||
static struct lock_file index_lock;
|
||||
int index_fd = hold_locked_index(&index_lock, 0);
|
||||
if (read_index_preload(&the_index, NULL) < 0)
|
||||
die("git %s: failed to read the index", me);
|
||||
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
|
||||
if (the_index.cache_changed) {
|
||||
if (write_index(&the_index, index_fd) ||
|
||||
commit_locked_index(&index_lock))
|
||||
die("git %s: failed to refresh the index", me);
|
||||
}
|
||||
rollback_lock_file(&index_lock);
|
||||
}
|
||||
|
||||
static int revert_or_cherry_pick(int argc, const char **argv)
|
||||
{
|
||||
struct rev_info revs;
|
||||
|
@ -567,8 +582,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
|
|||
die("cherry-pick --ff cannot be used with --edit");
|
||||
}
|
||||
|
||||
if (read_cache() < 0)
|
||||
die("git %s: failed to read the index", me);
|
||||
read_and_refresh_cache(me);
|
||||
|
||||
prepare_revs(&revs);
|
||||
|
||||
|
|
|
@ -81,6 +81,16 @@ test_expect_success 'revert after renaming branch' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success 'cherry-pick on stat-dirty working tree' '
|
||||
git clone . copy &&
|
||||
(
|
||||
cd copy &&
|
||||
git checkout initial &&
|
||||
test-chmtime +40 oops &&
|
||||
git cherry-pick added
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'revert forbidden on dirty working tree' '
|
||||
|
||||
echo content >extra_file &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче