summaryrefslogtreecommitdiff
path: root/fast-import.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bk/refs-multi-update'Junio C Hamano2013-09-201-1/+1
|\
| * refs: report ref type from lock_any_ref_for_updateBrad King2013-08-301-1/+1
* | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-171-10/+10
|\ \
| * | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-8/+8
| * | use 'tree-ish' instead of 'treeish'Richard Hansen2013-09-041-2/+2
| |/
* | Merge branch 'jk/fast-import-empty-ls'Junio C Hamano2013-09-041-20/+38
|\ \ | |/ |/|
| * fast-import: allow moving the root treejk/fast-import-empty-lsJohn Keeping2013-06-231-7/+14
| * fast-import: allow ls or filecopy of the root treeJohn Keeping2013-06-231-13/+22
| * fast-import: set valid mode on root tree in "ls"John Keeping2013-06-231-0/+2
* | Merge branch 'fc/fast-export-persistent-marks'Junio C Hamano2013-06-021-1/+1
|\ \
| * | fast-{import,export}: use get_sha1_hex() to read from marks fileFelipe Contreras2013-05-071-1/+1
| |/
* | sparse: Fix mingw_main() argument number/type errorsRamsay Jones2013-04-281-2/+2
|/
* fast-import: Fix an gcc -Wuninitialized warningRamsay Jones2013-03-291-0/+1
* fast-import: clarify "inline" logic in file_change_mJeff King2013-03-211-1/+2
* drop some obsolete "x = x" compiler warning hacksJeff King2013-03-211-1/+1
* fast-import: use pointer-to-pointer to keep list tailJeff King2013-03-211-6/+4
* Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-1/+1
|\
| * in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-271-1/+1
* | fast-import: tighten parsing of datarefsPete Wyckoff2012-04-101-33/+77
|/
* Merge branch 'jn/maint-fast-import-empty-ls' into maintJunio C Hamano2012-03-261-0/+4
|\
| * fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-lsJonathan Nieder2012-03-091-0/+2
| * fast-import: leakfix for 'ls' of dirty treesJonathan Nieder2012-03-091-0/+2
* | fast-import: zero all of 'struct tag' to silence valgrindThomas Rast2012-03-051-1/+1
* | Appease Sun Studio by renaming "tmpfile"ab/sun-studio-portabilityÆvar Arnfjörð Bjarmason2011-12-211-4/+4
* | Merge branch 'ab/enable-i18n'Junio C Hamano2011-12-191-0/+2
|\ \
| * | i18n: add infrastructure for translating Git with gettextab/enable-i18nÆvar Arnfjörð Bjarmason2011-12-051-0/+2
* | | Merge branch 'jc/stream-to-pack'Junio C Hamano2011-12-161-17/+8
|\ \ \
| * | | csum-file: introduce sha1file_checkpointJunio C Hamano2011-11-301-17/+8
| |/ /
* | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notesJohan Herland2011-11-281-3/+25
|/ /
* | Merge branch 'di/fast-import-empty-tag-note-fix'Junio C Hamano2011-10-131-0/+4
|\ \
| * | fast-import: don't allow to note on empty branchdi/fast-import-empty-tag-note-fixDmitry Ivankov2011-09-221-0/+2
| * | fast-import: don't allow to tag empty branchDmitry Ivankov2011-09-221-0/+2
* | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-6/+1
|/ /
* | Merge branch 'di/fast-import-tagging'Junio C Hamano2011-08-281-7/+7
|\ \
| * | fast-import: allow to tag newly created objectsDmitry Ivankov2011-08-231-3/+7
| * | fast-import: add tests for tagging blobsDmitry Ivankov2011-08-231-7/+3
* | | Merge branch 'di/fast-import-blob-tweak'Junio C Hamano2011-08-281-5/+12
|\ \ \
| * | | fast-import: treat cat-blob as a delta base hint for next blobDmitry Ivankov2011-08-221-1/+6
| * | | fast-import: count and report # of calls to diff_delta in statsDmitry Ivankov2011-08-221-4/+6
| |/ /
* | | Merge branch 'di/fast-import-deltified-tree'Junio C Hamano2011-08-281-5/+30
|\ \ \
| * | | fast-import: prevent producing bad deltaDmitry Ivankov2011-08-141-5/+30
| |/ /
* | | Merge branch 'di/fast-import-ident'Junio C Hamano2011-08-281-12/+21
|\ \ \
| * | | fast-import: check committer name more strictlyDmitry Ivankov2011-08-111-12/+17
| * | | fast-import: don't fail on omitted committer nameDmitry Ivankov2011-08-111-0/+4
| |/ /
* | | Merge branch 'sr/transport-helper-fix'Junio C Hamano2011-08-011-0/+8
|\ \ \
| * | | fast-import: introduce 'done' commandSverre Rabbelier2011-07-191-0/+8
| |/ /
* | | Merge branch 'jc/index-pack'Junio C Hamano2011-07-191-4/+6
|\ \ \
| * | | write_idx_file: introduce a struct to hold idx customization optionsJunio C Hamano2011-02-271-4/+6
* | | | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-101-2/+2
* | | | zlib: wrap deflateBound() tooJunio C Hamano2011-06-101-2/+2