| commit | 5d3698ffb4ccf8b842814559007e011fc409650b | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Sat, 24 Nov 2012 03:17:01 +0000 (24 04:17 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Nov 2012 19:05:12 +0000 (26 11:05 -0800) | ||
| tree | a038aa76261cb63916907918a133bbb11ba05450 | treesnapshot (tar.gz zip) |
| parent | 3a189da601e676a997cbb06b53da02cac364b2ff | commitdiff |
fast-export: avoid importing blob marks
We want to be able to import, and then export, using the same marks, so
that we don't push things that the other side already received.
Unfortunately, fast-export doesn't store blobs in the marks, but
fast-import does. This creates a mismatch when fast export is reusing a
mark that was previously stored by fast-import.
There is no point in one tool saving blobs, and the other not, but for
now let's just check in fast-export that the objects are indeed commits.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We want to be able to import, and then export, using the same marks, so
that we don't push things that the other side already received.
Unfortunately, fast-export doesn't store blobs in the marks, but
fast-import does. This creates a mismatch when fast export is reusing a
mark that was previously stored by fast-import.
There is no point in one tool saving blobs, and the other not, but for
now let's just check in fast-export that the objects are indeed commits.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/fast-export.c | diffblobblamehistory | |
| t/t9350-fast-export.sh | diffblobblamehistory |