summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-03Merge branch 'kb/maint-status-cquote'Libravatar Junio C Hamano1-0/+10
* kb/maint-status-cquote: status: Quote paths with spaces in short format
2010-12-03Merge branch 'jn/thinner-wrapper'Libravatar Junio C Hamano10-236/+249
* jn/thinner-wrapper: Remove pack file handling dependency from wrapper.o pack-objects: mark file-local variable static wrapper: give zlib wrappers their own translation unit strbuf: move strbuf_branchname to sha1_name.c path helpers: move git_mkstemp* to wrapper.c wrapper: move odb_* to environment.c wrapper: move xmmap() to sha1_file.c
2010-12-03Merge branch 'pn/commit-autosquash'Libravatar Junio C Hamano13-49/+267
* pn/commit-autosquash: add tests of commit --squash commit: --squash option for use with rebase --autosquash add tests of commit --fixup commit: --fixup option for use with rebase --autosquash pretty.c: teach format_commit_message() to reencode the output commit: helper methods to reduce redundant blocks of code Conflicts: Documentation/git-commit.txt t/t3415-rebase-autosquash.sh
2010-12-03Merge branch 'sn/diff-doc'Libravatar Junio C Hamano4-6/+64
* sn/diff-doc: docs: clarify git diff modes of operation diff,difftool: Don't use the {0,2} notation in usage strings CodingGuidelines: Add a section on writing documentation
2010-12-03Merge branch 'sp/emfile'Libravatar Junio C Hamano1-15/+28
* sp/emfile: Work around EMFILE when there are too many pack files Use git_open_noatime when accessing pack data
2010-12-03Merge branch 'jc/abbrev-guard'Libravatar Junio C Hamano5-1/+21
* jc/abbrev-guard: core.abbrevguard: Ensure short object names stay unique a bit longer
2010-12-03Merge branch 'jj/icase-directory'Libravatar Junio C Hamano8-27/+242
* jj/icase-directory: Support case folding in git fast-import when core.ignorecase=true Support case folding for git add when core.ignorecase=true Add case insensitivity support when using git ls-files Add case insensitivity support for directories when using git status Case insensitivity support for .gitignore via core.ignorecase Add string comparison functions that respect the ignore_case variable. Makefile & configure: add a NO_FNMATCH_CASEFOLD flag Makefile & configure: add a NO_FNMATCH flag Conflicts: Makefile config.mak.in configure.ac fast-import.c
2010-12-03Merge branch 'maint' to sync with Git 1.7.3.3Libravatar Junio C Hamano3-4/+16
* maint: Git 1.7.3.3 CodingGuidelines: mention whitespace preferences for shell scripts Documentation: do not misinterpret pull refspec as bold text Conflicts: Documentation/git-pull.txt RelNotes
2010-12-03Git 1.7.3.3Libravatar Junio C Hamano2-3/+11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-03CodingGuidelines: mention whitespace preferences for shell scriptsLibravatar Giuseppe Bilotta1-0/+4
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-03Documentation: do not misinterpret pull refspec as bold textLibravatar Jonathan Nieder1-2/+2
Use the {asterisk} entity to avoid mistreating the asterisks in "(e.g., refs/heads/*:refs/remotes/origin/*)" as delimiters for bold text. From a quick search with 'git grep -e "\*.*\*"', this seems to be the last example of this particular formatting problem. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Update draft release notes to 1.7.4Libravatar Junio C Hamano1-10/+37
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Merge branch 'maint'Libravatar Junio C Hamano6-2/+78
* maint: Git 1.7.0.8 Documentation: Fix mark-up of lines with more than one tilde Conflicts: GIT-VERSION-GEN
2010-12-02Prepare for 1.7.3.3Libravatar Junio C Hamano5-1/+77
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.2.4Libravatar Junio C Hamano5-2/+32
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.1.3Libravatar Junio C Hamano4-2/+22
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.0.8Libravatar Junio C Hamano3-2/+12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Documentation: Fix mark-up of lines with more than one tildeLibravatar Junio C Hamano2-2/+2
The manual pages of cherry-pick and revert had examples with two revisions on the same line in the examples section, that looked like this: git cherry-pick master~4 master~2:: Unfortunately, this is taken as a mark-up to make the part between two tildes, "4 master", subscript. Use {tilde} to make it explicit that we do want ~ characters in these places (backslash does not help). Reported-by: Sylvain Rabot <sylvain.rabot@f-secure.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Merge branch 'cb/maint-orphan-merge-noclobber' into maintLibravatar Junio C Hamano2-1/+35
* cb/maint-orphan-merge-noclobber: do not overwrite untracked during merge from unborn branch
2010-12-02Merge branch 'jk/add-e-doc' into maintLibravatar Junio C Hamano1-3/+77
* jk/add-e-doc: docs: give more hints about how "add -e" works docs: give more hints about how "add -e" works
2010-12-02Merge branch 'bg/maint-gitweb-test-lib' into maintLibravatar Junio C Hamano1-1/+1
* bg/maint-gitweb-test-lib: t/gitweb-lib: Don't pass constant to decode_utf8
2010-12-02Merge branch 'tr/maint-merge-file-subdir' into maintLibravatar Junio C Hamano3-3/+16
* tr/maint-merge-file-subdir: merge-file: correctly find files when called in subdir prefix_filename(): safely handle the case where pfx_len=0
2010-12-02Merge branch 'ks/no-textconv-symlink' into maintLibravatar Junio C Hamano6-25/+114
* ks/no-textconv-symlink: blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
2010-12-02Merge branch 'bc/fortran-userdiff' into maintLibravatar Junio C Hamano3-1/+20
* bc/fortran-userdiff: userdiff.c: add builtin fortran regex patterns
2010-12-01Merge branch 'maint'Libravatar Junio C Hamano4-5/+10
* maint: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--"
2010-12-01Merge branch 'maint-1.7.2' into maintLibravatar Junio C Hamano4-5/+10
* maint-1.7.2: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--"
2010-12-01Merge branch 'maint-1.7.1' into maint-1.7.2Libravatar Junio C Hamano2-2/+7
* maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors
2010-12-01Merge branch 'maint-1.7.0' into maint-1.7.1Libravatar Junio C Hamano2-2/+7
* maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors
2010-12-01add: introduce add.ignoreerrors synonym for add.ignore-errorsLibravatar Jonathan Nieder2-2/+7
The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add a config option to ignore errors for git-add, 2008-05-12) does not follow the usual convention for naming values in the git configuration file. What convention? Glad you asked. The section name indicates the affected subsystem. The subsection name, if any, indicates which of an unbound set of things to set the value for. The variable name describes the effect of tweaking this knob. The section and variable names can be broken into words using bumpyCaps in documentation as a hint to the reader. These word breaks are not significant at the level of code, since the section and variable names are not case sensitive. The name "add.ignore-errors" includes a dash, meaning a naive configuration file like [add] ignoreErrors does not have any effect. Avoid such confusion by renaming to the more consistent add.ignoreErrors, but keep the old version for backwards compatibility. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-01commit.c: Remove backward goto in read_craft_line()Libravatar Ralf Thielow1-6/+7
Bad graft data is noticed in several places in read_graft_line(), and in each case we go back to the first site of detection. It in general is a better style to have an exception handling out of line from the main codepath and make error codepath jump forward. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-01bash: Match lightweight tags in promptLibravatar knittl1-1/+1
The bash prompt would display a commit's object name when having checked out a lightweight tag. Provide `--tags` to `git describe` in the completion script, so it will display lightweight tag names, as it already does for annotated tags. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-01git-commit.txt: (synopsis): move -i and -o before "--"Libravatar Jari Aalto1-2/+2
All options, including -i and -o, must come before "--" which is the end of options marker. Reported-by: Joey Hess <joey@kitenet.net> Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-29Merge branch 'cb/leading-path-removal'Libravatar Junio C Hamano6-135/+215
* cb/leading-path-removal: use persistent memory for rejected paths do not overwrite files in leading path lstat_cache: optionally return match_len add function check_ok_to_remove() t7607: add leading-path tests t7607: use test-lib functions and check MERGE_HEAD Conflicts: t/t7607-merge-overwrite.sh
2010-11-29Merge branch 'en/merge-recursive'Libravatar Junio C Hamano7-240/+1172
* en/merge-recursive: (41 commits) t6022: Use -eq not = to test output of wc -l merge-recursive:make_room_for_directories - work around dumb compilers merge-recursive: Remove redundant path clearing for D/F conflicts merge-recursive: Make room for directories in D/F conflicts handle_delete_modify(): Check whether D/F conflicts are still present merge_content(): Check whether D/F conflicts are still present conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts conflict_rename_delete(): Check whether D/F conflicts are still present merge-recursive: Delay modify/delete conflicts if D/F conflict present merge-recursive: Delay content merging for renames merge-recursive: Delay handling of rename/delete conflicts merge-recursive: Move handling of double rename of one file to other file merge-recursive: Move handling of double rename of one file to two merge-recursive: Avoid doubly merging rename/add conflict contents merge-recursive: Update merge_content() call signature merge-recursive: Update conflict_rename_rename_1to2() call signature merge-recursive: Structure process_df_entry() to handle more cases merge-recursive: Have process_entry() skip D/F or rename entries merge-recursive: New function to assist resolving renames in-core only merge-recursive: New data structures for deferring of D/F conflicts ... Conflicts: t/t6020-merge-df.sh t/t6036-recursive-corner-cases.sh
2010-11-29Merge branch 'jl/clone-recurse-sm-synonym'Libravatar Junio C Hamano2-1/+5
* jl/clone-recurse-sm-synonym: clone: Add the --recurse-submodules option as alias for --recursive
2010-11-29Merge branch 'jn/cherry-pick-refresh-index'Libravatar Junio C Hamano2-2/+26
* jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
2010-11-29Merge branch 'jc/emfile'Libravatar Junio C Hamano1-18/+30
* jc/emfile: A loose object is not corrupt if it cannot be read due to EMFILE read_sha1_file(): report correct name of packfile with a corrupt object
2010-11-29Merge branch 'md/interix'Libravatar Junio C Hamano4-0/+58
* md/interix: Interix: add configure checks add support for the SUA layer (interix; windows) Conflicts: git-compat-util.h
2010-11-29Merge branch 'jl/add-p-reverse-message'Libravatar Junio C Hamano1-2/+11
* jl/add-p-reverse-message: Correct help blurb in checkout -p and friends
2010-11-29Merge branch 'np/pack-broken-boundary'Libravatar Junio C Hamano1-1/+15
* np/pack-broken-boundary: make pack-objects a bit more resilient to repo corruption
2010-11-29Merge branch 'np/diff-in-corrupt-repository'Libravatar Junio C Hamano1-2/+6
* np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing
2010-11-29Merge branch 'fc/apply-p2-get-header-name'Libravatar Junio C Hamano2-14/+40
* fc/apply-p2-get-header-name: test: git-apply -p2 rename/chmod only Fix git-apply with -p greater than 1
2010-11-29Merge branch 'jn/fast-import-fix'Libravatar Junio C Hamano2-12/+145
* jn/fast-import-fix: fast-import: do not clear notes in do_change_note_fanout() t9300 (fast-import): another test for the "replace root" feature fast-import: tighten M 040000 syntax fast-import: filemodify after M 040000 <tree> "" crashes
2010-11-29Merge branch 'rr/needs-clean-work-tree'Libravatar Junio C Hamano4-28/+34
* rr/needs-clean-work-tree: Porcelain scripts: Rewrite cryptic "needs update" error message
2010-11-29Merge branch 'kb/blame-author-email'Libravatar Junio C Hamano4-13/+38
* kb/blame-author-email: blame: Add option to show author email instead of name Conflicts: t/annotate-tests.sh
2010-11-29Merge branch 'cm/diff-check-at-eol'Libravatar Junio C Hamano2-1/+10
* cm/diff-check-at-eol: diff --check: correct line numbers of new blank lines at EOF
2010-11-29Merge branch 'ak/apply-non-git-epoch'Libravatar Junio C Hamano5-6/+57
* ak/apply-non-git-epoch: apply: handle patches with funny filename and colon in timezone apply: Recognize epoch timestamps with : in the timezone
2010-11-29Merge branch 'tc/smart-http-post-redirect'Libravatar Junio C Hamano3-0/+20
* tc/smart-http-post-redirect: smart-http: Don't change POST to GET when following redirect
2010-11-26Merge branch 'en/and-cascade-tests'Libravatar Junio C Hamano1-1/+1
* en/and-cascade-tests: t7300: add a missing SYMLINKS prerequisite
2010-11-26t7300: add a missing SYMLINKS prerequisiteLibravatar Johannes Sixt1-1/+1
The test fails on Windows since 2dec68c (tests: add missing &&, batch 2). Even though this test allocates and leaves behind files, subsequent tests do not depend on this, so it is safe to just skip it. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>