summaryrefslogtreecommitdiff
path: root/fast-import.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-5/+2
|\
| * fast-import: use git_path() for accessing .git dir instead of get_git_dir()Nguyễn Thái Ngọc Duy2014-12-011-4/+1
| * path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy2014-12-011-1/+1
* | Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-171-3/+0
|\ \
| * | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-051-3/+0
* | | Merge branch 'mh/refs-have-new'Junio C Hamano2015-03-051-3/+3
|\ \ \
| * | | ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-171-3/+3
| | |/ | |/|
* | | Merge branch 'jk/fast-import-die-nicely-fix'Junio C Hamano2015-02-251-1/+5
|\ \ \ | |/ / |/| |
| * | fast-import: avoid running end_packfile recursivelyjk/fast-import-die-nicely-fixJeff King2015-02-101-1/+5
| * | Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-291-1/+5
| |\ \
| * \ \ Merge branch 'jk/fast-import-fixes' into maintJunio C Hamano2014-09-191-8/+13
| |\ \ \
* | | | | refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-151-4/+4
* | | | | dump_marks(): reimplement using fdopen_lock_file()Michael Haggerty2014-10-011-19/+2
* | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* | | | | dump_marks(): remove a redundant call to rollback_lock_file()Michael Haggerty2014-10-011-3/+1
* | | | | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-261-1/+1
|\ \ \ \ \
| * | | | | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-1/+1
* | | | | | Merge branch 'mb/fast-import-delete-root'Junio C Hamano2014-09-191-1/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | fast-import: fix segfault in store_tree()mb/fast-import-delete-rootMaxim Bublis2014-08-291-1/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/commit-author-parsing'Junio C Hamano2014-09-191-11/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | date: use strbufs in date-formatting functionsJeff King2014-08-271-11/+9
| |/ / /
* | | | Merge branch 'jk/fast-import-fixes'Junio C Hamano2014-09-111-4/+7
|\ \ \ \ | | |/ / | |/| |
| * | | fast-import: fix buffer overflow in dump_tagsjk/top-level-refs-cleanupjk/fast-import-fixesJeff King2014-08-251-4/+6
| * | | fast-import: clean up pack_data pointer in end_packfileJeff King2014-08-251-4/+7
| | |/ | |/|
* | | Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-111-16/+38
|\ \ \
| * | | fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg2014-09-031-6/+23
| * | | fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg2014-09-031-10/+15
* | | | fast-import.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra2014-08-131-23/+21
| |_|/ |/| |
* | | fast-import: use hashcmp() for SHA1 hash comparisonRené Scharfe2014-07-181-1/+1
* | | fast-import: refactor parsing of spacesJeff King2014-06-201-13/+7
* | | fast-import: use skip_prefix for parsing inputJeff King2014-06-201-72/+51
* | | use skip_prefix to avoid magic numbersJeff King2014-06-201-32/+37
* | | fast-import: fix read of uninitialized argv memoryJeff King2014-06-201-5/+8
|/ /
* | fast-import: add support to delete refsFelipe Contreras2014-04-211-3/+10
|/
* use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlenRohit Mani2014-03-101-21/+12
* replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-40/+40
* 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