summaryrefslogtreecommitdiff
path: root/fast-import.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/fast-import-notes-fix-new' into maintJunio C Hamano2017-01-311-3/+5
|\
| * fast-import: properly fanout notes when tree is importedmh/fast-import-notes-fix-newMike Hommey2016-12-201-3/+5
* | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-151-13/+0
|/
* use QSORTRené Scharfe2016-09-291-2/+2
* Merge branch 'jk/common-main'Junio C Hamano2016-07-191-7/+2
|\
| * Merge branch 'jk/common-main-2.8' into jk/common-mainJunio C Hamano2016-07-061-7/+2
| |\
| | * common-main: call git_setup_gettext()Jeff King2016-07-011-2/+0
| | * common-main: call git_extract_argv0_path()Jeff King2016-07-011-3/+0
| | * add an extra level of indirection to main()Jeff King2016-07-011-2/+2
* | | Merge branch 'ew/fast-import-unpack-limit'Junio C Hamano2016-06-201-0/+61
|\ \ \ | |/ / |/| |
| * | fast-import: invalidate pack_id references after looseningew/fast-import-unpack-limitEric Wong2016-05-291-1/+30
| * | fast-import: implement unpack limitEric Wong2016-05-111-0/+32
| |/
* | Merge branch 'fc/fast-import-broken-marks-file'Junio C Hamano2016-05-311-2/+5
|\ \
| * | fast-import: do not truncate exported marks filefc/fast-import-broken-marks-fileFelipe Contreras2016-05-171-2/+5
| |/
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-3/+3
|\ \
| * | dir.c: rename str(n)cmp_icase to fspath(n)cmpNguyễn Thái Ngọc Duy2016-04-221-3/+3
| |/
* | fast-import.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-5/+5
|/
* Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-7/+5
|\
| * fast-import: simplify allocation in start_packfileJeff King2016-02-221-4/+1
| * use st_add and st_mult for allocation size computationJeff King2016-02-221-1/+1
| * convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-2/+3
* | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-2/+2
|/
* 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
|\ \ \ | |/ / |/| |
View Lorry Controller Status