diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:48 -0700 |
| commit | bb0ced758153412afc4af07fcadd983c364b4f67 (patch) | |
| tree | 8f2e5d43fae7bedad80c5efc8b7155300b107a29 /t | |
| parent | Merge branch 'jk/error-resolve-conflict-advice' (diff) | |
| parent | refs.c: change read_ref_at to use the reflog iterators (diff) | |
| download | tgif-bb0ced758153412afc4af07fcadd983c364b4f67.tar.xz | |
Merge branch 'rs/read-ref-at'
* rs/read-ref-at:
refs.c: change read_ref_at to use the reflog iterators
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1400-update-ref.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 4e2459afc5..0218e96366 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -235,7 +235,7 @@ test_expect_success \ 'rm -f o e && git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e && test '"$B"' = $(cat o) && - test "warning: Log .git/logs/'"$m has gap after $gd"'." = "$(cat e)"' + test "warning: Log for ref '"$m has gap after $gd"'." = "$(cat e)"' test_expect_success \ 'Query "master@{2005-05-26 23:38:00}" (middle of history)' \ 'rm -f o e && @@ -253,7 +253,7 @@ test_expect_success \ 'rm -f o e && git rev-parse --verify "master@{2005-05-28}" >o 2>e && test '"$D"' = $(cat o) && - test "warning: Log .git/logs/'"$m unexpectedly ended on $ld"'." = "$(cat e)"' + test "warning: Log for ref '"$m unexpectedly ended on $ld"'." = "$(cat e)"' rm -f .git/$m .git/logs/$m expect |