summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-08-30Merge branch 'maint'Libravatar Junio C Hamano1-4/+7
* maint: Documentation: clarify effects of -- <path> arguments
2011-08-30Documentation: clarify effects of -- <path> argumentsLibravatar Thomas Rast1-4/+7
'git log -- <path>' does not "show commits that affect the specified paths" in a literal sense unless --full-history is given (for example, a file that only existed on a side branch will turn up no commits at all!). Reword it to specify the actual intent of the filtering, and point to the "History Simplification" section. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-28Update draft release notes to 1.7.7Libravatar Junio C Hamano1-1/+24
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-28Merge branch 'nd/decorate-grafts'Libravatar Junio C Hamano4-21/+70
* nd/decorate-grafts: log: Do not decorate replacements with --no-replace-objects log: decorate "replaced" on to replaced commits log: decorate grafted commits with "grafted" Move write_shallow_commits to fetch-pack.c Add for_each_commit_graft() to iterate all grafts decoration: do not mis-decorate refs with same prefix
2011-08-28Merge branch 'nd/maint-clone-gitdir'Libravatar Junio C Hamano9-12/+33
* nd/maint-clone-gitdir: clone: allow to clone from .git file read_gitfile_gently(): rename misnamed function to read_gitfile()
2011-08-28Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano6-24/+65
* ci/forbid-unwanted-current-branch-update: Show interpreted branch name in error messages Prevent force-updating of the current branch
2011-08-28Merge branch 'jk/pager-with-external-command'Libravatar Junio C Hamano2-0/+38
* jk/pager-with-external-command: support pager.* for external commands
2011-08-28Merge branch 'jc/maint-clone-alternates'Libravatar Junio C Hamano3-30/+114
* jc/maint-clone-alternates: clone: clone from a repository with relative alternates clone: allow more than one --reference Conflicts: builtin/clone.c
2011-08-28Merge branch 'jk/color-and-pager'Libravatar Junio C Hamano21-147/+176
* jk/color-and-pager: want_color: automatically fallback to color.ui diff: don't load color config in plumbing config: refactor get_colorbool function color: delay auto-color decision until point of use git_config_colorbool: refactor stdout_is_tty handling diff: refactor COLOR_DIFF from a flag into an int setup_pager: set GIT_PAGER_IN_USE t7006: use test_config helpers test-lib: add helper functions for config t7006: modernize calls to unset Conflicts: builtin/commit.c parse-options.c
2011-08-28Merge branch 'mh/attr'Libravatar Junio C Hamano1-50/+63
* mh/attr: Unroll the loop over passes Change while loop into for loop Determine the start of the states outside of the pass loop Change parse_attr() to take a pointer to struct attr_state Increment num_attr in parse_attr_line(), not parse_attr() Document struct match_attr Add a file comment
2011-08-28Merge branch 'di/fast-import-tagging'Libravatar Junio C Hamano2-7/+74
* di/fast-import-tagging: fast-import: allow to tag newly created objects fast-import: add tests for tagging blobs
2011-08-28Merge branch 'di/fast-import-blob-tweak'Libravatar Junio C Hamano1-5/+12
* di/fast-import-blob-tweak: fast-import: treat cat-blob as a delta base hint for next blob fast-import: count and report # of calls to diff_delta in stats
2011-08-28Merge branch 'di/fast-import-deltified-tree'Libravatar Junio C Hamano2-5/+71
* di/fast-import-deltified-tree: fast-import: prevent producing bad delta fast-import: add a test for tree delta base corruption
2011-08-28Merge branch 'di/fast-import-ident'Libravatar Junio C Hamano5-18/+164
* di/fast-import-ident: fsck: improve committer/author check fsck: add a few committer name tests fast-import: check committer name more strictly fast-import: don't fail on omitted committer name fast-import: add input format tests
2011-08-28Merge branch 'bw/doc-repo-layout'Libravatar Junio C Hamano3-31/+34
* bw/doc-repo-layout: Mark http-fetch without -a as deprecated Documentation: Grammar correction, wording fixes and cleanup
2011-08-28Merge branch 'va/p4-branch-import'Libravatar Junio C Hamano3-9/+284
* va/p4-branch-import: git-p4: Add simple test case for branch import git-p4: Allow branch definition with git config git-p4: Allow filtering Perforce branches by user git-p4: Correct branch base depot path detection git-p4: Process detectCopiesHarder with --bool git-p4: Add test case for copy detection git-p4: Add test case for rename detection git-p4: Add description of rename/copy detection options git-p4: Allow setting rename/copy detection threshold
2011-08-28Merge branch 'jc/combine-diff-callback'Libravatar Junio C Hamano2-1/+70
* jc/combine-diff-callback: combine-diff: support format_callback
2011-08-28Merge branch 'nk/branch-v-abbrev'Libravatar Junio C Hamano2-2/+6
* nk/branch-v-abbrev: branch -v: honor core.abbrev
2011-08-25Git 1.7.7-rc0Libravatar Junio C Hamano2-3/+10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-25log: Do not decorate replacements with --no-replace-objectsLibravatar Michael J Gruber1-0/+2
5267d29 (log: decorate "replaced" on to replaced commits, 2011-08-19) introduced textual decorations for replaced commits, based on the detection of refs/replace. Make it so that additionally the use of --no-replace-objects is detected: I.e. replaced commits are only decorated as replaced when they are actually replaced. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-25Merge branch 'jc/merge-reword'Libravatar Junio C Hamano2-4/+4
* jc/merge-reword: merge: reword the final message
2011-08-25Merge branch 'mg/branch-set-upstream-previous'Libravatar Junio C Hamano2-1/+15
* mg/branch-set-upstream-previous: branch.c: use the parsed branch name
2011-08-25Merge branch 'da/difftool-mergtool-refactor'Libravatar Junio C Hamano18-320/+432
* da/difftool-mergtool-refactor: mergetools/meld: Use '--output' when available mergetool--lib: Refactor tools into separate files mergetool--lib: Make style consistent with git difftool--helper: Make style consistent with git
2011-08-25Merge branch 'jc/maint-autofix-tag-in-head'Libravatar Junio C Hamano1-42/+45
* jc/maint-autofix-tag-in-head: commit: reduce use of redundant global variables
2011-08-25Merge branch 'di/fast-import-doc'Libravatar Junio C Hamano2-3/+54
* di/fast-import-doc: doc/fast-import: document feature import-marks-if-exists
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Libravatar Junio C Hamano3-12/+30
* jn/plug-empty-tree-leak: merge-recursive: take advantage of hardcoded empty tree revert: plug memory leak in "cherry-pick root commit" codepath
2011-08-25Merge branch 'ac/describe-dirty-refresh'Libravatar Junio C Hamano1-2/+15
* ac/describe-dirty-refresh: describe: Refresh the index when run with --dirty
2011-08-25Merge branch 'di/parse-options-split'Libravatar Junio C Hamano6-152/+159
* di/parse-options-split: Reduce parse-options.o dependencies parse-options: export opterr, optbug
2011-08-25Merge branch 'js/i18n-scripts'Libravatar Junio C Hamano5-40/+44
* js/i18n-scripts: submodule: take advantage of gettextln and eval_gettextln. stash: take advantage of eval_gettextln pull: take advantage of eval_gettextln git-am: take advantage of gettextln and eval_gettextln. gettext: add gettextln, eval_gettextln to encode common idiom
2011-08-25Merge branch 'maint'Libravatar Junio C Hamano5-5/+5
* maint: whitespace: have SP on both sides of an assignment "=" update-ref: whitespace fix
2011-08-25whitespace: have SP on both sides of an assignment "="Libravatar Junio C Hamano4-4/+4
I've deliberately excluded the borrowed code in compat/nedmalloc directory. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-25update-ref: whitespace fixLibravatar Pang Yan Han1-1/+1
Signed-off-by: Pang Yan Han <pangyanhan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-24Sync with 1.7.6.1Libravatar Junio C Hamano2-1/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-24Git 1.7.6.1Libravatar Junio C Hamano2-2/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-24Merge branch 'jc/maint-smart-http-race-upload-pack' into maintLibravatar Junio C Hamano1-0/+2
* jc/maint-smart-http-race-upload-pack: get_indexed_object can return NULL if nothing is in that slot; check for it
2011-08-24get_indexed_object can return NULL if nothing is in that slot; check for itLibravatar Brian Harring1-0/+2
This fixes a segfault introduced by 051e400; via it, no longer able to trigger the http/smartserv race. Signed-off-by: Brian Harring <ferringb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-23Mark http-fetch without -a as deprecatedLibravatar Ben Walton2-0/+7
As the use of http-fetch without -a can create an object store that is invalid to the point where it cannot even be fsck'd, mark it as deprecated. A future release should change the default and then remove the option entirely. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-23Documentation: Grammar correction, wording fixes and cleanupLibravatar Ben Walton1-31/+27
Correct a few grammar issues in gitrepository-layout.txt and also rewords a few sections for clarity. Remove references to using http-fetch without -a to create a broken repository. Mark a few areas of the repository structure as legacy. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-23Update draft release notes to 1.7.7Libravatar Junio C Hamano1-15/+9
2011-08-23Merge branch 'rt/zlib-smaller-window'Libravatar Junio C Hamano23-13/+99
* rt/zlib-smaller-window: test: consolidate definition of $LF Tolerate zlib deflation with window size < 32Kb
2011-08-23Merge branch 'jn/maint-test-return'Libravatar Junio C Hamano2-9/+13
* jn/maint-test-return: t3900: do not reference numbered arguments from the test script test: cope better with use of return for errors test: simplify return value of test_run_
2011-08-23Merge branch 'cb/maint-ls-files-error-report'Libravatar Junio C Hamano6-10/+88
* cb/maint-ls-files-error-report: ls-files: fix pathspec display on error
2011-08-23Merge branch 'maint'Libravatar Junio C Hamano1-0/+11
* maint: Update draft release notes for 1.7.6.1
2011-08-23Update draft release notes for 1.7.6.1Libravatar Junio C Hamano1-0/+11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-23Merge branch 'jc/maint-combined-diff-work-tree' into maintLibravatar Junio C Hamano1-4/+10
* jc/maint-combined-diff-work-tree: diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" Conflicts: combine-diff.c
2011-08-23Merge branch 'cb/maint-exec-error-report' into maintLibravatar Junio C Hamano3-17/+33
* cb/maint-exec-error-report: notice error exit from pager error_routine: use parent's stderr if exec fails
2011-08-23Merge branch 'cb/maint-quiet-push' into maintLibravatar Junio C Hamano6-10/+39
* cb/maint-quiet-push: receive-pack: do not overstep command line argument array propagate --quiet to send-pack/receive-pack Conflicts: Documentation/git-receive-pack.txt Documentation/git-send-pack.txt
2011-08-23Merge branch 'jc/maint-smart-http-race-upload-pack' into maintLibravatar Junio C Hamano1-9/+98
* jc/maint-smart-http-race-upload-pack: helping smart-http/stateless-rpc fetch race
2011-08-23Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maintLibravatar Junio C Hamano1-0/+5
* jc/no-gitweb-test-without-cgi-etc: t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
2011-08-23fast-import: allow to tag newly created objectsLibravatar Dmitry Ivankov2-3/+33
fast-import allows to tag objects by sha1 and to query sha1 of objects being imported. So it should allow to tag these objects, make it do so. Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 23:26:49 +0000