diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-27 14:58:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-27 14:58:21 -0800 |
| commit | 7c3932334ef57e78f8cd170e3337f218646d7077 (patch) | |
| tree | 2460d512738914b0934172df5264f07f27d6162c /t | |
| parent | 103209c6782586d92b04ee1fc71c0fd6f6385f5f (diff) | |
| parent | 105e47339794ec2c862338d7a25df77b7d72385e (diff) | |
| download | git-7c3932334ef57e78f8cd170e3337f218646d7077.tar.gz git-7c3932334ef57e78f8cd170e3337f218646d7077.tar.xz | |
Merge branch 'jc/upstream-reflog'
* jc/upstream-reflog:
Fix log -g this@{upstream}
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1507-rev-parse-upstream.sh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index 95c9b0923..8c8dfdaf9 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -107,4 +107,33 @@ test_expect_success 'checkout other@{u}' ' test_cmp expect actual ' +cat >expect <<EOF +commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5 +Reflog: master@{0} (C O Mitter <committer@example.com>) +Reflog message: branch: Created from HEAD +Author: A U Thor <author@example.com> +Date: Thu Apr 7 15:15:13 2005 -0700 + + 3 +EOF +test_expect_success 'log -g other@{u}' ' + git log -1 -g other@{u} >actual && + test_cmp expect actual +' + +cat >expect <<EOF +commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5 +Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>) +Reflog message: branch: Created from HEAD +Author: A U Thor <author@example.com> +Date: Thu Apr 7 15:15:13 2005 -0700 + + 3 +EOF + +test_expect_success 'log -g other@{u}@{now}' ' + git log -1 -g other@{u}@{now} >actual && + test_cmp expect actual +' + test_done |