diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-23 22:37:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-23 22:37:23 -0700 |
| commit | 98ee8187e4e331716be0797169ba9ddbb26efe56 (patch) | |
| tree | a4ee87b74fd3c6050e91537314c12c069929e5cc /t | |
| parent | 072570ee2689c5f19513157d654f04f5a7113a24 (diff) | |
| parent | a21f0f0a22c513130f1268e3296dd52d47d2f0e0 (diff) | |
| download | git-98ee8187e4e331716be0797169ba9ddbb26efe56.tar.gz git-98ee8187e4e331716be0797169ba9ddbb26efe56.tar.xz | |
Merge branch 'maint'
* maint:
Fix possible coredump with fast-import --import-marks
Refactor fast-import branch creation from existing commit
fast-import: Fix crash when referencing already existing objects
fast-import: Fix uninitialized variable
Documentation: fix git-config.xml generation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9300-fast-import.sh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 8e958da53..72e49f5d3 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -119,6 +119,35 @@ test_expect_success \ </dev/null && git diff -u expect marks.new' +test_tick +cat >input <<INPUT_END +commit refs/heads/verify--import-marks +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data <<COMMIT +recreate from :5 +COMMIT + +from :5 +M 755 :2 copy-of-file2 + +INPUT_END +test_expect_success \ + 'A: verify marks import does not crash' \ + 'git-fast-import --import-marks=marks.out <input && + git-whatchanged verify--import-marks' +test_expect_success \ + 'A: verify pack' \ + 'for p in .git/objects/pack/*.pack;do git-verify-pack $p||exit;done' +cat >expect <<EOF +:000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2 +EOF +git-diff-tree -M -r master verify--import-marks >actual +test_expect_success \ + 'A: verify diff' \ + 'compare_diff_raw expect actual && + test `git-rev-parse --verify master:file2` \ + = `git-rev-parse --verify verify--import-marks:copy-of-file2`' + ### ### series B ### |