diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-15 16:19:48 +0400 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-03-17 20:47:47 +0400 |
| commit | 4b7e1b9e927eec2359f178a260335109d4222e2b (patch) | |
| tree | 6b9e3a332e6d710f0b17f0f07bc9541a9eab3538 /tests/reset | |
| parent | cb562c3fb305b7fa2ddc46983a6107f7b8340293 (diff) | |
refs: append to the HEAD reflog when updating the current branch
When we update the current branch, we must also append to HEAD's reflog
to keep them in sync.
This is a bit of a hack, but as git.git says, it covers 100% of
default cases.
Diffstat (limited to 'tests/reset')
| -rw-r--r-- | tests/reset/hard.c | 10 | ||||
| -rw-r--r-- | tests/reset/mixed.c | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/tests/reset/hard.c b/tests/reset/hard.c index 36120ee63..c6bf7a8ac 100644 --- a/tests/reset/hard.c +++ b/tests/reset/hard.c @@ -215,16 +215,18 @@ void test_reset_hard__reflog_is_correct(void) git_object_free(target); /* Moved branch, expect default message */ + exp_msg = "reset: moving"; cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}")); cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL, NULL)); - reflog_check(repo, "HEAD", 3, "emeric.fermas@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 4, NULL, "reset: moving"); + reflog_check(repo, "HEAD", 4, NULL, exp_msg); + reflog_check(repo, "refs/heads/master", 4, NULL, exp_msg); git_object_free(target); /* Moved branch, expect custom message */ + exp_msg = "message1"; cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}")); cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL, "message1")); - reflog_check(repo, "HEAD", 3, "emeric.fermas@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 5, NULL, "message1"); + reflog_check(repo, "HEAD", 5, NULL, exp_msg); + reflog_check(repo, "refs/heads/master", 5, NULL, exp_msg); } diff --git a/tests/reset/mixed.c b/tests/reset/mixed.c index 5d8ff63b4..55b8a2f88 100644 --- a/tests/reset/mixed.c +++ b/tests/reset/mixed.c @@ -65,17 +65,19 @@ void test_reset_mixed__reflog_is_correct(void) target = NULL; /* Moved branch, expect default message */ + exp_msg = "reset: moving"; cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}")); cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL, NULL)); - reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 10, NULL, "reset: moving"); + reflog_check(repo, "HEAD", 10, NULL, exp_msg); + reflog_check(repo, "refs/heads/master", 10, NULL, exp_msg); git_object_free(target); target = NULL; /* Moved branch, expect custom message */ + exp_msg = "message1"; cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}")); cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL, "message1")); - reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 11, NULL, "message1"); + reflog_check(repo, "HEAD", 11, NULL, exp_msg); + reflog_check(repo, "refs/heads/master", 11, NULL, exp_msg); } |