diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:23 -0700 |
| commit | c0d503433f99916f727b8ce75be957ee650a4095 (patch) | |
| tree | 7037bff59cb153e990bf399ef9d739d0c9c4bbb8 /t | |
| parent | Merge branch 'gr/rebase-i-drop-warn' (diff) | |
| parent | fast-import: add a get-mark command (diff) | |
| download | tgif-c0d503433f99916f727b8ce75be957ee650a4095.tar.xz | |
Merge branch 'mh/fast-import-get-mark'
"git fast-import" learned to respond to the get-mark command via
its cat-blob-fd interface.
* mh/fast-import-get-mark:
fast-import: add a get-mark command
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9300-fast-import.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index aac126fd57..9984c48b5a 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2339,6 +2339,19 @@ test_expect_success !MINGW 'R: in-stream cat-blob-fd not respected' ' test_cmp expect actual.1 ' +test_expect_success !MINGW 'R: print mark for new blob' ' + echo "effluentish" | git hash-object --stdin >expect && + git fast-import --cat-blob-fd=6 6>actual <<-\EOF && + blob + mark :1 + data <<BLOB_END + effluentish + BLOB_END + get-mark :1 + EOF + test_cmp expect actual +' + test_expect_success !MINGW 'R: print new blob' ' blob=$(echo "yep yep yep" | git hash-object --stdin) && cat >expect <<-EOF && |