summaryrefslogtreecommitdiff
path: root/fast-import.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/lock-file-commit-error'Junio C Hamano2015-12-111-1/+1
|\
| * Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-011-1/+1
* | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-201-7/+10
|\ \
| * | convert strncpy to memcpyJeff King2015-10-051-1/+1
| * | prefer memcpy to strcpyJeff King2015-10-051-2/+3
| * | avoid sprintf and strcpy with flex arraysJeff King2015-10-051-2/+4
| * | use xsnprintf for generating git object headersJeff King2015-09-251-2/+2
| |/
* | Merge branch 'jk/date-local'Junio C Hamano2015-10-051-1/+1
|\ \ | |/ |/|
| * fast-import: switch crash-report date to iso8601Jeff King2015-09-031-1/+1
* | Merge branch 'jk/git-path'Junio C Hamano2015-08-191-1/+3
|\ \
| * | prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-101-1/+3
* | | Merge branch 'jc/finalize-temp-file'Junio C Hamano2015-08-191-2/+2
|\ \ \ | |/ / |/| |
| * | sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-fileJunio C Hamano2015-08-101-2/+2
* | | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-1/+1
|\ \ \ | | |/ | |/|
| * | convert "enum date_mode" into a structJeff King2015-06-291-1/+1
* | | Merge branch 'mh/fast-import-optimize-current-from'Junio C Hamano2015-08-031-12/+17
|\ \ \
| * | | fast-import: do less work when given "from" matches current branch headmh/fast-import-optimize-current-fromMike Hommey2015-07-131-12/+17
| |/ /
* | | Merge branch 'mh/fast-import-get-mark'Junio C Hamano2015-08-031-4/+29
|\ \ \
| * | | fast-import: add a get-mark commandmh/fast-import-get-markMichael Haggerty2015-07-011-4/+29
* | | | update_ref(): don't read old reference value before deleteMichael Haggerty2015-06-221-3/+3
| |/ / |/| |
* | | 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