summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7300-clean: require POSIXPERM for chmod 0 testee/clean-remove-dirsJohannes Sixt2015-08-111-1/+1
* read_gitfile_gently: fix use-after-freeJeff King2015-06-261-9/+5
* clean: improve performance when removing lots of directoriesErik Elfström2015-06-152-10/+30
* p7300: add performance tests for cleanErik Elfström2015-06-151-0/+31
* t7300: add tests to document behavior of clean and nested gitErik Elfström2015-06-151-0/+142
* setup: sanity check file size in read_gitfile_gentlyErik Elfström2015-06-152-0/+8
* setup: add gentle version of read_gitfileErik Elfström2015-06-092-20/+75
* Sync with 2.4.3Junio C Hamano2015-06-052-1/+78
|\
| * Git 2.4.3v2.4.3Junio C Hamano2015-06-054-3/+80
| * Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
| |\
| * \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-058-35/+13
| |\ \
| * \ \ Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-053-9/+9
| |\ \ \
| * \ \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano2015-06-051-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-052-2/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-053-2/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano2015-06-051-5/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-0519-102/+107
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-051-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-053-33/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-053-118/+312
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-052-11/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-052-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-052-22/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-052-0/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-052-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-052-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-052-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-051-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-0510-81/+243
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | The first half of the seventh batch for 2.5Junio C Hamano2015-06-051-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-editor-multi-words'Junio C Hamano2015-06-055-7/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: tests: use test-chmtime in place of touchld/p4-editor-multi-wordsLuke Diamand2015-05-262-5/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: fix handling of multi-word P4EDITORLuke Diamand2015-05-243-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: add failing test for P4EDITOR handlingLuke Diamand2015-05-241-0/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-06-0536-255/+300
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | struct ref_lock: convert old_sha1 member to object_idMichael Haggerty2015-05-251-12/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | warn_if_dangling_symref(): convert local variable "junk" to object_idMichael Haggerty2015-05-251-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | each_ref_fn_adapter(): remove adapterMichael Haggerty2015-05-252-19/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rev_list_insert_ref(): remove unneeded argumentsMichael Haggerty2015-05-251-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rev_list_insert_ref_oid(): new function, taking an object_oidMichael Haggerty2015-05-251-3/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete(): remove unneeded argumentsMichael Haggerty2015-05-251-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete_oid(): new function, taking an object_oidMichael Haggerty2015-05-251-4/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | clear_marks(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-8/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mark_complete(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-6/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | send_ref(): convert local variable "peeled" to object_idMichael Haggerty2015-05-251-3/+3