aboutsummaryrefslogtreecommitdiffstats
path: root/fast-import.c
AgeCommit message (Expand)AuthorFilesLines
2016-07-19Merge branch 'jk/common-main'Junio C Hamano1-7/+2
2016-07-06Merge branch 'jk/common-main-2.8' into jk/common-mainJunio C Hamano1-7/+2
2016-07-01common-main: call git_setup_gettext()Jeff King1-2/+0
2016-07-01common-main: call git_extract_argv0_path()Jeff King1-3/+0
2016-07-01add an extra level of indirection to main()Jeff King1-2/+2
2016-06-20Merge branch 'ew/fast-import-unpack-limit'Junio C Hamano1-0/+61
2016-05-31Merge branch 'fc/fast-import-broken-marks-file'Junio C Hamano1-2/+5
2016-05-29fast-import: invalidate pack_id references after looseningEric Wong1-1/+30
2016-05-23Merge branch 'nd/worktree-various-heads'Junio C Hamano1-3/+3
2016-05-17fast-import: do not truncate exported marks fileFelipe Contreras1-2/+5
2016-05-11fast-import: implement unpack limitEric Wong1-0/+32
2016-05-09fast-import.c: use error_errno()Nguyễn Thái Ngọc Duy1-5/+5
2016-04-22dir.c: rename str(n)cmp_icase to fspath(n)cmpNguyễn Thái Ngọc Duy1-3/+3
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-7/+5
2016-02-22fast-import: simplify allocation in start_packfileJeff King1-4/+1
2016-02-22use st_add and st_mult for allocation size computationJeff King1-1/+1
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King1-2/+3
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano1-2/+2
2015-12-11Merge branch 'sg/lock-file-commit-error'Junio C Hamano1-1/+1
2015-12-01Make error message after failing commit_lock_file() less confusingSZEDER Gábor1-1/+1
2015-10-20Merge branch 'jk/war-on-sprintf'Junio C Hamano1-7/+10
2015-10-05Merge branch 'jk/date-local'Junio C Hamano1-1/+1
2015-10-05convert strncpy to memcpyJeff King1-1/+1
2015-10-05prefer memcpy to strcpyJeff King1-2/+3
2015-10-05avoid sprintf and strcpy with flex arraysJeff King1-2/+4
2015-09-25use xsnprintf for generating git object headersJeff King1-2/+2
2015-09-03fast-import: switch crash-report date to iso8601Jeff King1-1/+1
2015-08-19Merge branch 'jk/git-path'Junio C Hamano1-1/+3
2015-08-19Merge branch 'jc/finalize-temp-file'Junio C Hamano1-2/+2
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesJeff King1-1/+3
2015-08-10sha1_file.c: rename move_temp_to_file() to finalize_object_file()Junio C Hamano1-2/+2
2015-08-03Merge branch 'jk/date-mode-format'Junio C Hamano1-1/+1
2015-08-03Merge branch 'mh/fast-import-optimize-current-from'Junio C Hamano1-12/+17
2015-08-03Merge branch 'mh/fast-import-get-mark'Junio C Hamano1-4/+29
2015-07-13fast-import: do less work when given "from" matches current branch headMike Hommey1-12/+17
2015-07-01fast-import: add a get-mark commandMichael Haggerty1-4/+29
2015-06-29convert "enum date_mode" into a structJeff King1-1/+1
2015-06-22update_ref(): don't read old reference value before deleteMichael Haggerty1-3/+3
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano1-5/+2
2015-03-17Merge branch 'rs/deflate-init-cleanup'Junio C Hamano1-3/+0
2015-03-05zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe1-3/+0
2015-03-05Merge branch 'mh/refs-have-new'Junio C Hamano1-3/+3
2015-02-25Merge branch 'jk/fast-import-die-nicely-fix'Junio C Hamano1-1/+5
2015-02-17ref_transaction_update(): remove "have_old" parameterMichael Haggerty1-3/+3
2015-02-10fast-import: avoid running end_packfile recursivelyJeff King1-1/+5
2014-12-01fast-import: use git_path() for accessing .git dir instead of get_git_dir()Nguyễn Thái Ngọc Duy1-4/+1
2014-12-01path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy1-1/+1
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg1-4/+4
2014-10-01dump_marks(): reimplement using fdopen_lock_file()Michael Haggerty1-19/+2
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-10-01dump_marks(): remove a redundant call to rollback_lock_file()Michael Haggerty1-3/+1
2014-09-29Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano1-1/+5
2014-09-26Merge branch 'rs/realloc-array'Junio C Hamano1-1/+1
2014-09-19Merge branch 'jk/fast-import-fixes' into maintJunio C Hamano1-8/+13
2014-09-19Merge branch 'mb/fast-import-delete-root'Junio C Hamano1-1/+5
2014-09-19Merge branch 'jk/commit-author-parsing'Junio C Hamano1-11/+9
2014-09-18use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe1-1/+1
2014-09-11Merge branch 'jk/fast-import-fixes'Junio C Hamano1-4/+7
2014-09-11Merge branch 'rs/ref-transaction-1'Junio C Hamano1-16/+38
2014-09-03fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg1-6/+23
2014-09-03fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg1-10/+15
2014-08-29fast-import: fix segfault in store_tree()Maxim Bublis1-1/+5
2014-08-27date: use strbufs in date-formatting functionsJeff King1-11/+9
2014-08-25fast-import: fix buffer overflow in dump_tagsJeff King1-4/+6
2014-08-25fast-import: clean up pack_data pointer in end_packfileJeff King1-4/+7
2014-08-13fast-import.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra1-23/+21
2014-07-18fast-import: use hashcmp() for SHA1 hash comparisonRené Scharfe1-1/+1
2014-06-20fast-import: refactor parsing of spacesJeff King1-13/+7
2014-06-20fast-import: use skip_prefix for parsing inputJeff King1-72/+51
2014-06-20use skip_prefix to avoid magic numbersJeff King1-32/+37
2014-06-20fast-import: fix read of uninitialized argv memoryJeff King1-5/+8
2014-04-21fast-import: add support to delete refsFelipe Contreras1-3/+10
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani1-21/+12
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-40/+40
2013-09-20Merge branch 'bk/refs-multi-update'Junio C Hamano1-1/+1
2013-09-17Merge branch 'rh/ishes-doc'Junio C Hamano1-10/+10
2013-09-04use 'commit-ish' instead of 'committish'Richard Hansen1-8/+8
2013-09-04use 'tree-ish' instead of 'treeish'Richard Hansen1-2/+2
2013-09-04Merge branch 'jk/fast-import-empty-ls'Junio C Hamano1-20/+38
2013-08-30refs: report ref type from lock_any_ref_for_updateBrad King1-1/+1
2013-06-23fast-import: allow moving the root treeJohn Keeping1-7/+14
2013-06-23fast-import: allow ls or filecopy of the root treeJohn Keeping1-13/+22
2013-06-23fast-import: set valid mode on root tree in "ls"John Keeping1-0/+2
2013-06-02Merge branch 'fc/fast-export-persistent-marks'Junio C Hamano1-1/+1
2013-05-07fast-{import,export}: use get_sha1_hex() to read from marks fileFelipe Contreras1-1/+1
2013-04-28sparse: Fix mingw_main() argument number/type errorsRamsay Jones1-2/+2
2013-03-29fast-import: Fix an gcc -Wuninitialized warningRamsay Jones1-0/+1
2013-03-21fast-import: clarify "inline" logic in file_change_mJeff King1-1/+2
2013-03-21drop some obsolete "x = x" compiler warning hacksJeff King1-1/+1
2013-03-21fast-import: use pointer-to-pointer to keep list tailJeff King1-6/+4
2012-09-11Merge branch 'jc/merge-bases'Junio C Hamano1-1/+1
2012-08-27in_merge_bases(): support only one "other" commitJunio C Hamano1-1/+1
2012-04-10fast-import: tighten parsing of datarefsPete Wyckoff1-33/+77
2012-03-26Merge branch 'jn/maint-fast-import-empty-ls' into maintJunio C Hamano1-0/+4
2012-03-09fast-import: don't allow 'ls' of path with empty componentsJonathan Nieder1-0/+2
2012-03-09fast-import: leakfix for 'ls' of dirty treesJonathan Nieder1-0/+2
2012-03-05fast-import: zero all of 'struct tag' to silence valgrindThomas Rast1-1/+1
2011-12-21Appease Sun Studio by renaming "tmpfile"Ævar Arnfjörð Bjarmason1-4/+4
2011-12-19Merge branch 'ab/enable-i18n'Junio C Hamano1-0/+2
2011-12-16Merge branch 'jc/stream-to-pack'Junio C Hamano1-17/+8
2011-12-05i18n: add infrastructure for translating Git with gettextÆvar Arnfjörð Bjarmason1-0/+2
2011-11-30csum-file: introduce sha1file_checkpointJunio C Hamano1-17/+8
2011-11-28fast-import: Fix incorrect fanout level when modifying existing notes refsJohan Herland1-3/+25
2011-10-13Merge branch 'di/fast-import-empty-tag-note-fix'Junio C Hamano1-0/+4
2011-10-05Change check_ref_format() to take a flags argumentMichael Haggerty1-6/+1
2011-09-22fast-import: don't allow to note on empty branchDmitry Ivankov1-0/+2
2011-09-22fast-import: don't allow to tag empty branchDmitry Ivankov1-0/+2
2011-08-28Merge branch 'di/fast-import-tagging'Junio C Hamano1-7/+7
2011-08-28Merge branch 'di/fast-import-blob-tweak'Junio C Hamano1-5/+12
2011-08-28Merge branch 'di/fast-import-deltified-tree'Junio C Hamano1-5/+30
2011-08-28Merge branch 'di/fast-import-ident'Junio C Hamano1-12/+21
2011-08-23fast-import: allow to tag newly created objectsDmitry Ivankov1-3/+7
2011-08-23fast-import: add tests for tagging blobsDmitry Ivankov1-7/+3
2011-08-22fast-import: treat cat-blob as a delta base hint for next blobDmitry Ivankov1-1/+6
2011-08-22fast-import: count and report # of calls to diff_delta in statsDmitry Ivankov1-4/+6
2011-08-14fast-import: prevent producing bad deltaDmitry Ivankov1-5/+30
2011-08-11fast-import: check committer name more strictlyDmitry Ivankov1-12/+17
2011-08-11fast-import: don't fail on omitted committer nameDmitry Ivankov1-0/+4
2011-08-01Merge branch 'sr/transport-helper-fix'Junio C Hamano1-0/+8
2011-07-19fast-import: introduce 'done' commandSverre Rabbelier1-0/+8
2011-07-19Merge branch 'jc/index-pack'Junio C Hamano1-4/+6
2011-06-10zlib: zlib can only process 4GB at a timeJunio C Hamano1-2/+2
2011-06-10zlib: wrap deflateBound() tooJunio C Hamano1-2/+2
2011-06-10zlib: wrap deflate side of the APIJunio C Hamano1-11/+11
2011-05-05fast-import: fix option parser for no-arg optionsSverre Rabbelier1-3/+3
2011-05-04Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano1-5/+0
2011-04-05Teach core.bigfilethreashold to pack-objectsJunio C Hamano1-5/+0
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2011-03-16Merge branch 'maint'Junio C Hamano1-28/+14
2011-03-16standardize brace placement in struct definitionsJonathan Nieder1-28/+14
2011-03-15Merge branch 'sp/maint-fd-limit'Junio C Hamano1-0/+1
2011-03-02sha1_file.c: Don't retain open fds on small packsShawn O. Pearce1-0/+1
2011-02-28fast-import: make code "-Wpointer-arith" cleanJonathan Nieder1-1/+1
2011-02-27write_idx_file: introduce a struct to hold idx customization optionsJunio C Hamano1-4/+6
2011-02-26fast-import: add 'ls' commandDavid Barr1-3/+159
2011-02-09Merge branch 'rr/fi-import-marks-if-exists'Junio C Hamano1-3/+13
2011-02-09Merge branch 'maint-1.7.0' into maintJunio C Hamano1-0/+2
2011-02-09fast-import: introduce "feature notes" commandJonathan Nieder1-0/+2
2011-01-27Merge branch 'maint'Junio C Hamano1-0/+6
2011-01-27Merge branch 'jn/fast-import-empty-tree-removal' into maintJunio C Hamano1-0/+6
2011-01-27fast-import: treat filemodify with empty tree as deleteJonathan Nieder1-0/+6
2011-01-19Merge branch 'jn/maint-fast-import-object-reuse' into maintJunio C Hamano1-7/+2
2011-01-18fast-import: Introduce --import-marks-if-existsRamkumar Ramachandra1-3/+13
2010-12-16Merge branch 'jn/fast-import-blob-access'Junio C Hamano1-9/+120
2010-12-16Merge branch 'jn/maint-fast-import-object-reuse'Junio C Hamano1-7/+2
2010-12-16Merge branch 'jn/fast-import-ondemand-checkpoint'Junio C Hamano1-1/+40
2010-12-03Merge branch 'jj/icase-directory'Junio C Hamano1-3/+4
2010-12-01fast-import: Allow cat-blob requests at arbitrary points in streamJonathan Nieder1-12/+16
2010-12-01fast-import: let importers retrieve blobsDavid Barr1-0/+97
2010-12-01fast-import: stricter parsing of integer optionsJonathan Nieder1-2/+11
2010-11-29Merge branch 'jn/fast-import-fix'Junio C Hamano1-12/+37
2010-11-24fast-import: treat SIGUSR1 as a request to access objects earlyJonathan Nieder1-1/+40
2010-11-24fast-import: insert new object entries at start of hash bucketDavid Barr1-7/+2
2010-10-21Sync with 1.7.3.2Junio C Hamano1-1/+1
2010-10-20fast-import: do not clear notes in do_change_note_fanout()Jonathan Nieder1-4/+1
2010-10-18fast-import: tighten M 040000 syntaxJonathan Nieder1-9/+25
2010-10-18fast-import: filemodify after M 040000 <tree> "" crashesJonathan Nieder1-4/+16
2010-10-13fast-import: Allow filemodify to set the rootDavid Barr1-0/+9
2010-10-08Use angles for placeholders consistentlyŠtěpán Němec1-1/+1
2010-10-06Support case folding in git fast-import when core.ignorecase=trueJoshua Jensen1-3/+4
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano1-0/+8
2010-08-18Merge branch 'jn/fast-import-subtree'Junio C Hamano1-9/+15
2010-08-11fast-import: export correctly marks larger than 2^20-1Raja R Harinath1-1/+1
2010-07-09fast-import: Improve robustness when D->F changes provided in wrong orderElijah Newren1-0/+8
2010-07-05Teach fast-import to import subtrees named by tree idJonathan Nieder1-9/+15
2010-06-21Merge branch 'gv/portable'Junio C Hamano1-1/+1
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan1-1/+1
2010-03-31fast-import: always create marks_file directoriesSverre Rabbelier1-0/+2
2010-02-17refactor duplicated encode_header in pack-objects and fast-importMichael Lukashov1-26/+3
2010-02-17fast-import: use the diff_delta() max_delta_size argumentNicolas Pitre1-6/+2
2010-02-17fast-import: honor pack.indexversion and pack.packsizelimit config varsNicolas Pitre1-0/+11
2010-02-17fast-import: make default pack size unlimitedNicolas Pitre1-6/+6
2010-02-17fast-import: use write_idx_file() instead of custom codeNicolas Pitre1-46/+17
2010-02-17fast-import: use sha1write() for pack dataNicolas Pitre1-10/+25
2010-02-17fast-import: start using struct pack_idx_entryNicolas Pitre1-29/+28
2010-02-04fast-import: count --max-pack-size in bytesJunio C Hamano1-6/+11
2010-02-04fast-import.c: Fix big-file-threshold parsing bugJunio C Hamano1-1/+4
2010-02-01Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blobJunio C Hamano1-18/+156
2010-02-01fast-import: Stream very large blobs directly to packShawn O. Pearce1-19/+160
2010-01-20Merge branch 'jh/notes' (early part)Junio C Hamano1-5/+129
2010-01-18Merge branch 'maint'Junio C Hamano1-5/+5
2010-01-18Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maintJunio C Hamano1-5/+5
2010-01-17Merge branch 'sr/gfi-options'Junio C Hamano1-86/+231
2010-01-14fast-import: tag may point to any object typeDmitry Potapov1-5/+5
2009-12-31fast-import: Document author/committer/tagger name is optionalShawn O. Pearce1-3/+3
2009-12-07fast-import: Proper notes tree manipulationJohan Herland1-5/+129
2009-12-05fast-import: add (non-)relative-marks featureSverre Rabbelier1-2/+17
2009-12-04fast-import: allow for multiple --import-marks= argumentsSverre Rabbelier1-5/+16
2009-12-04fast-import: add option commandSverre Rabbelier1-25/+62
2009-12-04fast-import: add feature commandSverre Rabbelier1-0/+38
2009-12-04fast-import: put marks reading in its own functionSverre Rabbelier1-42/+51
2009-12-04fast-import: put option parsing code in separate functionsSverre Rabbelier1-40/+75
2009-11-20Merge branch 'jh/notes' (early part)Junio C Hamano1-4/+84
2009-11-10Show usage string for 'git fast-import -h'Jonathan Nieder1-0/+3
2009-10-19fast-import: Add support for importing commit notesJohan Herland1-4/+84
2009-10-07fast-import.c::validate_raw_date(): really validate the valueJunio C Hamano1-3/+6
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-2/+2
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-2/+2
2009-05-18Merge branch 'ar/unlink-err'Junio C Hamano1-2/+2
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras1-7/+7