| 53cdd4e | Junio C Hamano | 28 January 2013, 19:17:54 UTC | Git 1.8.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2013, 19:17:54 UTC |
| a77133e | Junio C Hamano | 28 January 2013, 19:13:31 UTC | Merge branch 'ss/help-htmlpath-config-doc' into maint * ss/help-htmlpath-config-doc: config.txt: Document help.htmlpath config parameter | 28 January 2013, 19:13:31 UTC |
| 6d7c1c8 | Junio C Hamano | 28 January 2013, 19:13:07 UTC | Merge branch 'nd/attr-debug-fix' into maint * nd/attr-debug-fix: attr: make it build with DEBUG_ATTR again | 28 January 2013, 19:13:07 UTC |
| 7025616 | Junio C Hamano | 28 January 2013, 19:12:47 UTC | Merge branch 'ds/completion-silence-in-tree-path-probe' into maint * ds/completion-silence-in-tree-path-probe: git-completion.bash: silence "not a valid object" errors | 28 January 2013, 19:12:47 UTC |
| 095d65d | Junio C Hamano | 28 January 2013, 19:12:36 UTC | Merge branch 'jn/maint-trim-vim-contrib' into maint * jn/maint-trim-vim-contrib: contrib/vim: simplify instructions for old vim support | 28 January 2013, 19:12:36 UTC |
| a94214b | Junio C Hamano | 28 January 2013, 19:12:31 UTC | Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint * pe/doc-email-env-is-trumped-by-config: git-commit-tree(1): correct description of defaults | 28 January 2013, 19:12:31 UTC |
| c1640aa | Junio C Hamano | 28 January 2013, 19:11:51 UTC | Merge branch 'mk/complete-tcsh' into maint Command line completion for "tcsh" emitted an unwanted space after completing a single directory name. * mk/complete-tcsh: Prevent space after directories in tcsh completion | 28 January 2013, 19:11:51 UTC |
| 85fd059 | Junio C Hamano | 28 January 2013, 19:10:25 UTC | Merge branch 'ap/status-ignored-in-ignored-directory' into maint Output from "git status --ignored" did not work well when used with "--untracked". * ap/status-ignored-in-ignored-directory: status: always report ignored tracked directories git-status: Test --ignored behavior dir.c: Make git-status --ignored more consistent | 28 January 2013, 19:10:25 UTC |
| 3a51e4b | Junio C Hamano | 28 January 2013, 19:09:37 UTC | Merge branch 'er/stop-recommending-parsecvs' into maint * er/stop-recommending-parsecvs: Remove the suggestion to use parsecvs, which is currently broken. | 28 January 2013, 19:09:37 UTC |
| ce956fc | Junio C Hamano | 28 January 2013, 19:07:18 UTC | Merge branch 'mh/ceiling' into maint An element on GIT_CEILING_DIRECTORIES list that does not name the real path to a directory (i.e. a symbolic link) could have caused the GIT_DIR discovery logic to escape the ceiling. * mh/ceiling: string_list_longest_prefix(): remove function setup_git_directory_gently_1(): resolve symlinks in ceiling paths longest_ancestor_length(): require prefix list entries to be normalized longest_ancestor_length(): take a string_list argument for prefixes longest_ancestor_length(): use string_list_split() Introduce new function real_path_if_valid() real_path_internal(): add comment explaining use of cwd Introduce new static function real_path_internal() | 28 January 2013, 19:07:18 UTC |
| b344bb1 | John Keeping | 21 January 2013, 16:22:06 UTC | git-for-each-ref.txt: 'raw' is a supported date format Commit 7dff9b3 (Support 'raw' date format) added a raw date format. Update the git-for-each-ref documentation to include this. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2013, 00:26:26 UTC |
| 74f3267 | Junio C Hamano | 21 January 2013, 01:26:04 UTC | Start preparing for 1.8.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2013, 01:26:04 UTC |
| cea1e2e | Junio C Hamano | 21 January 2013, 01:22:49 UTC | Merge branch 'nz/send-email-headers-are-case-insensitive' into maint When users spell "cc:" in lowercase in the fake "header" in the trailer part, "git send-email" failed to pick up the addresses from there. As e-mail headers field names are case insensitive, this script should follow suit and treat "cc:" and "Cc:" the same way. * nz/send-email-headers-are-case-insensitive: git-send-email: treat field names as case-insensitively | 21 January 2013, 01:22:49 UTC |
| ca7ccd5 | Junio C Hamano | 21 January 2013, 01:22:27 UTC | Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maint "git archive" did not record uncompressed size in the header when streaming a zip archive, which confused some implementations of unzip. * rs/zip-with-uncompressed-size-in-the-header: archive-zip: write uncompressed size into header even with streaming | 21 January 2013, 01:22:27 UTC |
| 1bc7a2b | Junio C Hamano | 21 January 2013, 01:22:22 UTC | Merge branch 'rs/zip-tests' into maint * rs/zip-tests: t5003: check if unzip supports symlinks t5000, t5003: move ZIP tests into their own script t0024, t5000: use test_lazy_prereq for UNZIP t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead | 21 January 2013, 01:22:22 UTC |
| b1f809d | Sebastian Staudt | 15 January 2013, 20:56:21 UTC | config.txt: Document help.htmlpath config parameter Signed-off-by: Sebastian Staudt <koraktor@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2013, 21:08:45 UTC |
| 712efb1 | Nguyễn Thái Ngọc Duy | 15 January 2013, 02:49:26 UTC | attr: make it build with DEBUG_ATTR again Commit 82dce99 (attr: more matching optimizations from .gitignore - 2012-10-15) changed match_attr structure but it did not update DEBUG_ATTR-specific code. This fixes it. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2013, 18:02:08 UTC |
| e4f59a3 | Junio C Hamano | 14 January 2013, 16:04:50 UTC | Git 1.8.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2013, 16:04:50 UTC |
| dca93d2 | Junio C Hamano | 14 January 2013, 16:02:35 UTC | Merge branch 'jk/complete-commit-c' into maint * jk/complete-commit-c: completion: complete refs for "git commit -c" | 14 January 2013, 16:02:35 UTC |
| 750a6ca | Junio C Hamano | 14 January 2013, 16:01:27 UTC | Merge branch 'jk/unify-exit-code-by-receiving-signal' into maint * jk/unify-exit-code-by-receiving-signal: run-command: encode signal death as a positive integer | 14 January 2013, 16:01:27 UTC |
| 32a03dc | Junio C Hamano | 14 January 2013, 16:01:00 UTC | Merge branch 'jn/xml-depends-on-asciidoc-conf' into maint * jn/xml-depends-on-asciidoc-conf: docs: manpage XML depends on asciidoc.conf | 14 January 2013, 16:01:00 UTC |
| 267aaa0 | Junio C Hamano | 14 January 2013, 15:59:46 UTC | Merge branch 'jk/maint-fast-import-doc-reorder' into maint * jk/maint-fast-import-doc-reorder: git-fast-import(1): reorganise options git-fast-import(1): combine documentation of --[no-]relative-marks | 14 January 2013, 15:59:46 UTC |
| 74abc17 | Junio C Hamano | 14 January 2013, 15:59:03 UTC | Merge branch 'jk/shortlog-no-wrap-doc' into maint * jk/shortlog-no-wrap-doc: git-shortlog(1): document behaviour of zero-width wrap | 14 January 2013, 15:59:03 UTC |
| 7b9ea42 | Junio C Hamano | 14 January 2013, 15:48:39 UTC | Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint * jk/maint-fast-import-doc-dedup-done: git-fast-import(1): remove duplicate '--done' option | 14 January 2013, 15:48:39 UTC |
| f2f5449 | Junio C Hamano | 14 January 2013, 15:34:37 UTC | Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maint * jc/comment-cygwin-win32api-in-makefile: Makefile: add comment on CYGWIN_V15_WIN32API | 14 January 2013, 15:34:37 UTC |
| f0c103b | Junio C Hamano | 14 January 2013, 15:34:12 UTC | Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maint A tar archive created by "git archive" recorded a directory in a way that made NetBSD's implementation of "tar" sometimes unhappy. * rs/leave-base-name-in-name-field-of-tar: archive-tar: split long paths more carefully | 14 January 2013, 15:34:12 UTC |
| 32e820b | Junio C Hamano | 14 January 2013, 15:33:48 UTC | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maint When "git clone --separate-git-dir=$over_there" is interrupted, it failed to remove the real location of the $GIT_DIR it created. This was most visible when interrupting a submodule update. * jl/interrupt-clone-remove-separate-git-dir: clone: support atomic operation with --separate-git-dir | 14 January 2013, 15:33:49 UTC |
| bc60f9f | Junio C Hamano | 14 January 2013, 15:33:30 UTC | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint "git merge --no-edit" computed who were involved in the work done on the side branch, even though that information is to be discarded without getting seen in the editor. * jc/maint-fmt-merge-msg-no-edit-lose-credit: merge --no-edit: do not credit people involved in the side branch | 14 January 2013, 15:33:30 UTC |
| 7842c44 | Junio C Hamano | 14 January 2013, 15:33:08 UTC | Merge branch 'jc/apply-trailing-blank-removal' into maint "git apply" misbehaved when fixing whitespace breakages by removing excess trailing blank lines. * jc/apply-trailing-blank-removal: apply.c:update_pre_post_images(): the preimage can be truncated | 14 January 2013, 15:33:08 UTC |
| 659742f | Junio C Hamano | 14 January 2013, 15:32:25 UTC | Merge branch 'pf/editor-ignore-sigint' into maint The behaviour visible to the end users was confusing, when they attempt to kill a process spawned in the editor that was in turn launched by Git with SIGINT (or SIGQUIT), as Git would catch that signal and die. We ignore these signals now. * pf/editor-ignore-sigint: fix compilation with NO_PTHREADS launch_editor: propagate signals from editor to git run-command: do not warn about child death from terminal launch_editor: ignore terminal signals while editor has control launch_editor: refactor to use start/finish_command run-command: drop silent_exec_failure arg from wait_or_whine | 14 January 2013, 15:32:25 UTC |
| 6cf0a9e | Junio C Hamano | 14 January 2013, 15:32:18 UTC | Merge branch 'mk/maint-graph-infinity-loop' into maint * mk/maint-graph-infinity-loop: graph.c: infinite loop in git whatchanged --graph -m | 14 January 2013, 15:32:18 UTC |
| ab60f2c | Junio C Hamano | 12 January 2013, 00:51:01 UTC | Merge branch 'as/api-allocation-doc' into maint * as/api-allocation-doc: api-allocation-growing.txt: encourage better variable naming | 12 January 2013, 00:51:01 UTC |
| d0f9456 | Junio C Hamano | 12 January 2013, 00:49:37 UTC | Merge branch 'jk/enable-test-lint-by-default' into maint We have two simple and quick tests to catch common mistakes when writing test scripts, but we did not run them by default when running tests. * jk/enable-test-lint-by-default: tests: turn on test-lint by default | 12 January 2013, 00:49:38 UTC |
| b663af5 | Junio C Hamano | 12 January 2013, 00:49:01 UTC | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint "git merge" started calling prepare-commit-msg hook like "git commit" does some time ago, but forgot to pay attention to the exit status of the hook. * ap/merge-stop-at-prepare-commit-msg-failure: merge: Honor prepare-commit-msg return code | 12 January 2013, 00:49:01 UTC |
| 02cb8da | Junio C Hamano | 12 January 2013, 00:48:54 UTC | Merge branch 'jc/submittingpatches' into maint * jc/submittingpatches: SubmittingPatches: give list and maintainer addresses SubmittingPatches: remove overlong checklist SubmittingPatches: mention subsystems with dedicated repositories SubmittingPatches: who am I and who cares? | 12 January 2013, 00:48:54 UTC |
| 23ad617 | Junio C Hamano | 12 January 2013, 00:48:30 UTC | Merge branch 'os/gitweb-highlight-uncaptured' into maint "gitweb", when sorting by age to show repositories with new activities first, used to sort repositories with absolutely nothing in it early, which was not very useful. * os/gitweb-highlight-uncaptured: gitweb: fix error in sanitize when highlight is enabled | 12 January 2013, 00:48:30 UTC |
| 378e5e4 | Junio C Hamano | 12 January 2013, 00:48:03 UTC | Merge branch 'jn/less-reconfigure' into maint When autoconf is used, any build on a different commit always ran "config.status --recheck" even when unnecessary. * jn/less-reconfigure: build: do not automatically reconfigure unless configure.ac changed | 12 January 2013, 00:48:03 UTC |
| 37a1130 | Junio C Hamano | 12 January 2013, 00:47:56 UTC | Merge branch 'kb/maint-bundle-doc' into maint * kb/maint-bundle-doc: Documentation: full-ness of a bundle is significant for cloning Documentation: correct example restore from bundle | 12 January 2013, 00:47:56 UTC |
| b88cb88 | Junio C Hamano | 12 January 2013, 00:47:34 UTC | Merge branch 'as/test-name-alias-uniquely' into maint * as/test-name-alias-uniquely: Use longer alias names in subdirectory tests | 12 January 2013, 00:47:34 UTC |
| e6f1550 | Junio C Hamano | 12 January 2013, 00:47:07 UTC | Merge branch 'jn/warn-on-inaccessible-loosen' into maint When attempting to read the XDG-style $HOME/.config/git/config and finding that $HOME/.config/git is a file, we gave a wrong error message, instead of treating the case as "a custom config file does not exist there" and moving on. * jn/warn-on-inaccessible-loosen: config: exit on error accessing any config file doc: advertise GIT_CONFIG_NOSYSTEM config: treat user and xdg config permission problems as errors config, gitignore: failure to access with ENOTDIR is ok | 12 January 2013, 00:47:07 UTC |
| 22fd1c8 | Junio C Hamano | 12 January 2013, 00:46:46 UTC | Merge branch 'ja/directory-attrs' into maint The attribute mechanism didn't allow limiting attributes to be applied to only a single directory itself with "path/" like the exclude mechanism does. * ja/directory-attrs: Add directory pattern matching to attributes | 12 January 2013, 00:46:46 UTC |
| c039f35 | Junio C Hamano | 12 January 2013, 00:45:44 UTC | Merge branch 'jc/fetch-ignore-symref' into maint "git fetch --mirror" and fetch that uses other forms of refspec with wildcard used to attempt to update a symbolic ref that match the wildcard on the receiving end, which made little sense (the real ref that is pointed at by the symbolic ref would be updated anyway). Symbolic refs no longer are affected by such a fetch. * jc/fetch-ignore-symref: fetch: ignore wildcarded refspecs that update local symbolic refs | 12 January 2013, 00:45:44 UTC |
| 9a4a941 | Junio C Hamano | 12 January 2013, 00:45:06 UTC | Merge branch 'ss/svn-prompt' into maint The way "git svn" asked for password using SSH_ASKPASS and GIT_ASKPASS was not in line with the rest of the system. * ss/svn-prompt: git-svn, perl/Git.pm: extend and use Git->prompt method for querying users perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set git-svn, perl/Git.pm: add central method for prompting passwords | 12 January 2013, 00:45:06 UTC |
| ca87dd6 | Dylan Smith | 11 January 2013, 08:06:22 UTC | git-completion.bash: silence "not a valid object" errors Trying to complete the command git show master:./file would cause a "Not a valid object name" error to be output on standard error. Silence the error so it won't appear on the command line. Signed-off-by: Dylan Smith <dylan.ah.smith@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2013, 16:44:08 UTC |
| 9a6dcb3 | Jonathan Nieder | 10 January 2013, 20:54:27 UTC | contrib/vim: simplify instructions for old vim support Rely on the upstream filetype.vim instead of duplicating its rules in git's instructions for syntax highlighting support on pre-7.2 vim versions. The result is a shorter contrib/vim/README. More importantly, it lets us punt on maintenance of the autocmd rules. So now when we fix the upstream gitsendemail rule in light of commit eed6ca7, new git users stuck on old vim reading contrib/vim/README can automagically get the fix without any further changes needed to git. Once the world has moved on to vim 7.2+ completely, we can get rid of these instructions, but for now if they are this simple it's effortless to keep them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2013, 22:58:54 UTC |
| bf7c3f7 | Junio C Hamano | 10 January 2013, 22:17:13 UTC | Prepare for 1.8.1.1 | 10 January 2013, 22:17:13 UTC |
| 022250a | Christian Couder | 18 December 2012, 15:26:38 UTC | Makefile: detect when PYTHON_PATH changes When make is run, the python scripts are created from *.py files that are changed to use the python given by PYTHON_PATH. And PYTHON_PATH is set by default to /usr/bin/python on Linux. However, next time make is run with a different value in PYTHON_PATH, we failed to regenerate these scripts. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2013, 22:14:37 UTC |
| f6f3921 | Junio C Hamano | 10 January 2013, 22:11:18 UTC | Merge branch 'ta/remove-stale-translated-tut' into maint * ta/remove-stale-translated-tut: Remove Documentation/pt_BR/gittutorial.txt | 10 January 2013, 22:11:18 UTC |
| 3a0ee3e | Junio C Hamano | 10 January 2013, 22:10:40 UTC | Merge branch 'tb/test-t9810-no-sed-i' into maint * tb/test-t9810-no-sed-i: t9810: Do not use sed -i | 10 January 2013, 22:10:40 UTC |
| 1493bcc | Junio C Hamano | 10 January 2013, 22:10:36 UTC | Merge branch 'tb/test-t9020-no-which' into maint * tb/test-t9020-no-which: t9020: which is not portable | 10 January 2013, 22:10:36 UTC |
| 3129891 | Junio C Hamano | 10 January 2013, 22:04:26 UTC | Merge branch 'mh/pthreads-autoconf' into maint * mh/pthreads-autoconf: configure.ac: fix pthreads detection on Mac OS X | 10 January 2013, 22:04:26 UTC |
| 80ff618 | Junio C Hamano | 10 January 2013, 22:04:24 UTC | Merge branch 'jc/same-encoding' into maint * jc/same-encoding: format_commit_message(): simplify calls to logmsg_reencode() | 10 January 2013, 22:04:24 UTC |
| 74474a9 | Junio C Hamano | 10 January 2013, 22:04:22 UTC | Merge branch 'sp/shortlog-missing-lf' into maint * sp/shortlog-missing-lf: strbuf_add_wrapped*(): Remove unused return value shortlog: fix wrapping lines of wraplen | 10 January 2013, 22:04:23 UTC |
| 2601298 | Junio C Hamano | 10 January 2013, 22:04:21 UTC | Merge branch 'md/gitweb-sort-by-age' into maint * md/gitweb-sort-by-age: gitweb: Sort projects with undefined ages last | 10 January 2013, 22:04:21 UTC |
| c12a978 | Junio C Hamano | 10 January 2013, 22:04:19 UTC | Merge branch 'nd/invalidate-i-t-a-cache-tree' into maint * nd/invalidate-i-t-a-cache-tree: cache-tree: invalidate i-t-a paths after generating trees cache-tree: fix writing cache-tree when CE_REMOVE is present cache-tree: replace "for" loops in update_one with "while" loops cache-tree: remove dead i-t-a code in verify_cache() | 10 January 2013, 22:04:19 UTC |
| f70eec8 | Junio C Hamano | 10 January 2013, 22:04:17 UTC | Merge branch 'jk/repack-ref-racefix' into maint * jk/repack-ref-racefix: refs: do not use cached refs in repack_without_ref | 10 January 2013, 22:04:17 UTC |
| 8bc714b | Junio C Hamano | 10 January 2013, 22:03:54 UTC | Merge branch 'rb/http-cert-cred-no-username-prompt' into maint * rb/http-cert-cred-no-username-prompt: http.c: Avoid username prompt for certifcate credentials | 10 January 2013, 22:03:54 UTC |
| be33414 | Peter Eisentraut | 10 January 2013, 12:29:58 UTC | git-commit-tree(1): correct description of defaults The old phrasing indicated that the EMAIL environment variable takes precedence over the user.email configuration setting, but it is the other way around. Signed-off-by: Peter Eisentraut <peter@eisentraut.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2013, 18:18:51 UTC |
| 29b1b21 | John Keeping | 09 January 2013, 19:45:29 UTC | git-fast-import(1): reorganise options The options in git-fast-import(1) are not currently arranged in a logical order, which has caused the '--done' options to be documented twice (commit 3266de10). Rearrange them into logical groups under subheadings. Suggested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2013, 22:16:06 UTC |
| c8a9f3d | John Keeping | 09 January 2013, 19:44:38 UTC | git-fast-import(1): combine documentation of --[no-]relative-marks The descriptions of '--relative-marks' and '--no-relative-marks' make more sense when read together instead of as two independent options. Combine them into a single description block. Signed-off-by: John Keeping <john@keeping.me.uk> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2013, 22:10:53 UTC |
| 0e82bd0 | John Keeping | 09 January 2013, 20:16:45 UTC | git-shortlog(1): document behaviour of zero-width wrap Commit 00d3947 (Teach --wrap to only indent without wrapping) added special behaviour for a width of zero in the '-w' argument to 'git-shortlog' but this was not documented. Fix this. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2013, 22:08:59 UTC |
| 850bc56 | John Keeping | 07 January 2013, 11:57:09 UTC | git-fast-import(1): remove duplicate '--done' option The '--done' option to git-fast-import is documented twice in its manual page. Combine the best bits of each description, keeping the location of the instance that was added first. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2013, 21:20:45 UTC |
| 283b365 | René Scharfe | 08 January 2013, 20:23:01 UTC | t1402: work around shell quoting issue on NetBSD The test fails for me on NetBSD 6.0.1 and reports: ok 1 - ref name '' is invalid ok 2 - ref name '/' is invalid ok 3 - ref name '/' is invalid with options --allow-onelevel ok 4 - ref name '/' is invalid with options --normalize error: bug in the test script: not 2 or 3 parameters to test-expect-success The alleged bug is in this line: invalid_ref NOT_MINGW '/' '--allow-onelevel --normalize' invalid_ref() constructs a test case description using its last argument, but the shell seems to split it up into two pieces if it contains a space. Minimal test case: # on NetBSD with /bin/sh $ a() { echo $#-$1-$2; } $ t="x"; a "${t:+$t}" 1-x- $ t="x y"; a "${t:+$t}" 2-x-y $ t="x y"; a "${t:+x y}" 1-x y- # and with bash $ t="x y"; a "${t:+$t}" 1-x y- $ t="x y"; a "${t:+x y}" 1-x y- This may be a bug in the shell, but here's a simple workaround: Construct the description string first and store it in a variable, and then use that to call test_expect_success(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2013, 21:18:49 UTC |
| 4208fa5 | Junio C Hamano | 08 January 2013, 19:17:10 UTC | Merge branch 'ms/subtree-fixlets' into maint * ms/subtree-fixlets: git-subtree: fix typo in manpage git-subtree: ignore git-subtree executable | 08 January 2013, 19:17:10 UTC |
| b48b632 | Junio C Hamano | 08 January 2013, 19:17:07 UTC | Merge branch 'ss/nedmalloc-compilation' into maint * ss/nedmalloc-compilation: nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2 | 08 January 2013, 19:17:07 UTC |
| abf3e84 | Junio C Hamano | 08 January 2013, 19:17:05 UTC | Merge branch 'jc/maint-fnmatch-old-style-definition' into maint * jc/maint-fnmatch-old-style-definition: compat/fnmatch: update old-style definition to ANSI | 08 January 2013, 19:17:05 UTC |
| 9e3d58a | Junio C Hamano | 08 January 2013, 19:17:03 UTC | Merge branch 'jc/test-portability' into maint * jc/test-portability: t9020: use configured Python to run the test helper t3600: Avoid "cp -a", which is a GNUism | 08 January 2013, 19:17:03 UTC |
| 8da3933 | Junio C Hamano | 08 January 2013, 19:17:01 UTC | Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into maint * jc/maint-fbsd-sh-ifs-workaround: sh-setup: work around "unset IFS" bug in some shells | 08 January 2013, 19:17:01 UTC |
| 480640e | Junio C Hamano | 08 January 2013, 19:16:58 UTC | Merge branch 'jc/mkstemp-more-careful-error-reporting' into maint * jc/mkstemp-more-careful-error-reporting: xmkstemp(): avoid showing truncated template more carefully | 08 January 2013, 19:16:58 UTC |
| 59932be | Junio C Hamano | 08 January 2013, 19:16:56 UTC | Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maint * jc/test-cvs-no-init-in-existing-dir: t9200: let "cvs init" create the test repository | 08 January 2013, 19:16:56 UTC |
| ee18de6 | Junio C Hamano | 08 January 2013, 19:16:52 UTC | Merge branch 'jc/maint-test-portability' into maint * jc/maint-test-portability: t4014: fix arguments to grep t9502: do not assume GNU tar t0200: "locale" may not exist | 08 January 2013, 19:16:52 UTC |
| 831d57a | W. Trevor King | 08 January 2013, 15:47:37 UTC | remote-hg: Fix biridectionality -> bidirectionality typos Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2013, 17:37:05 UTC |
| 92f1c04 | Marc Khouzam | 07 January 2013, 19:07:10 UTC | Prevent space after directories in tcsh completion If git-completion.bash returns a single directory as a completion, tcsh will automatically add a space after it, which is not what the user wants. This commit prevents tcsh from doing this. Also, a check is added to make sure the tcsh version used is recent enough to allow completion to work as expected. Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2013, 19:51:26 UTC |
| a45fb69 | Antoine Pelisse | 06 January 2013, 22:09:39 UTC | status: always report ignored tracked directories When enumerating paths that are ignored, paths the index knows about are not included in the result. The "index knows about" check is done by consulting the name hash, not the actual contents of the index: - When core.ignorecase is false, directory names are not in the name hash, and ignored ones are shown as ignored (directories can never be tracked anyway). - When core.ignorecase is true, however, the name hash keeps track of the names of directories, in order to detect additions of the paths under different cases. This causes ignored directories to be mistakenly excluded when enumerating ignored paths. Stop excluding directories that are in the name hash when looking for ignored files in dir_add_name(); the names that are actually in the index are excluded much earlier in the callchain in treat_file(), so this fix will not make them mistakenly identified as ignored. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2013, 19:06:29 UTC |
| 55292ea | René Scharfe | 06 January 2013, 17:59:39 UTC | t5003: check if unzip supports symlinks Only add a symlink to the repository if both the filesystem and unzip support symlinks. To check the latter, add a ZIP file containing a symlink, created like this with InfoZIP zip 3.0: $ echo sample text >textfile $ ln -s textfile symlink $ zip -y infozip-symlinks.zip textfile symlink If we can extract it successfully, we add a symlink to the test repository for git archive --format=zip, or otherwise skip that step. Users can see the skipped test and perhaps run it again with a different unzip version. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2013, 16:47:55 UTC |
| e9882c8 | René Scharfe | 06 January 2013, 17:51:34 UTC | t5000, t5003: move ZIP tests into their own script This makes ZIP specific tweaks easier. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2013, 16:47:55 UTC |
| 25d3d32 | René Scharfe | 06 January 2013, 17:49:00 UTC | t0024, t5000: use test_lazy_prereq for UNZIP This change makes the code smaller and we can put it at the top of the script, its rightful place as setup code. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2013, 16:47:51 UTC |
| 6310071 | Nickolai Zeldovich | 07 January 2013, 01:34:58 UTC | git-send-email: treat field names as case-insensitively Field names like To:, Cc:, etc. are case-insensitive; use a case-insensitive regexp to match them as such. Previously, git-send-email would fail to pick-up the addresses when in-body "fake" headers with different cases (e.g. lowercase "cc:") are manually inserted to the messages it was asked to send, even though the text will still show them. Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2013, 07:48:12 UTC |
| ac00128 | René Scharfe | 06 January 2013, 17:47:57 UTC | t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead InfoZIP's unzip takes default parameters from the environment variable UNZIP. Unset it in the test library and use GIT_UNZIP for specifying alternate versions of the unzip command instead. t0024 wasn't even using variable for the actual extraction. t5000 was, but when setting it to InfoZIP's unzip it would try to extract from itself (because it treats the contents of $UNZIP as parameters), which failed of course. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2013, 07:37:40 UTC |
| 49a370d | Mark Levedahl | 06 January 2013, 19:56:33 UTC | Makefile: add comment on CYGWIN_V15_WIN32API There is no documented, reliable, and future-proof method to determine the installed w32api version on Cygwin. There are many things that can be done that will work frequently, except when they won't. The only sane thing is to follow the guidance of the Cygwin developers: the only supported configuration is that which the current setup.exe produces, and in the case of problems, if the installation is not up to date then updating is the first required action. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 21:36:46 UTC |
| 5062f9e | Adam Spiers | 06 January 2013, 15:35:05 UTC | api-allocation-growing.txt: encourage better variable naming The documentation for the ALLOC_GROW API implicitly encouraged developers to use "ary" as the variable name for the array which is dynamically grown. However "ary" is an unusual abbreviation hardly used anywhere else in the source tree, and it is also better to name variables based on their contents not on their type. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 20:57:56 UTC |
| 5ea2c84 | René Scharfe | 06 January 2013, 15:20:57 UTC | archive-zip: write uncompressed size into header even with streaming We record the uncompressed and compressed sizes and the CRC of streamed files as zero in the local header of the file. The actual values are recorded in an extra data descriptor after the file content, and in the usual ZIP directory entry at the end of the archive. While we know the compressed size and the CRC only after we processed the contents, we actually know the uncompressed size right from the start. And for files that we store uncompressed we also already know their final size. Do it like InfoZIP's zip and recored the known values, even though they can be reconstructed using the ZIP directory and the data descriptors alone. InfoZIP's unzip worked fine before, but NetBSD's version actually depends on these fields. The uncompressed size is already set by sha1_object_info(). We just need to initialize the compressed size to zero or the uncompressed size depending on the compression method (0 means storing). The CRC was propertly initialized already. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 19:35:26 UTC |
| fdb0424 | Jonathan Nieder | 06 January 2013, 12:01:53 UTC | docs: manpage XML depends on asciidoc.conf When building manual pages, the source text is transformed to XML with AsciiDoc before the man pages are generated from the XML with xmlto. Fix the dependencies in the Makefile so that the XML files are rebuilt when asciidoc.conf changes and not just the manual pages from unchanged XML, and move the dependencies from a recipeless rule to the rules with commands that use asciidoc.conf to make the dependencies easier to understand and maintain. Reported-by: John Keeping <john@keeping.me.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Tested-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 19:13:14 UTC |
| 709ca73 | Jeff King | 05 January 2013, 14:49:49 UTC | run-command: encode signal death as a positive integer When a sub-command dies due to a signal, we encode the signal number into the numeric exit status as "signal - 128". This is easy to identify (versus a regular positive error code), and when cast to an unsigned integer (e.g., by feeding it to exit), matches what a POSIX shell would return when reporting a signal death in $? or through its own exit code. So we have a negative value inside the code, but once it passes across an exit() barrier, it looks positive (and any code we receive from a sub-shell will have the positive form). E.g., death by SIGPIPE (signal 13) will look like -115 to us in inside git, but will end up as 141 when we call exit() with it. And a program killed by SIGPIPE but run via the shell will come to us with an exit code of 141. Unfortunately, this means that when the "use_shell" option is set, we need to be on the lookout for _both_ forms. We might or might not have actually invoked the shell (because we optimize out some useless shell calls). If we didn't invoke the shell, we will will see the sub-process's signal death directly, and run-command converts it into a negative value. But if we did invoke the shell, we will see the shell's 128+signal exit status. To be thorough, we would need to check both, or cast the value to an unsigned char (after checking that it is not -1, which is a magic error value). Fortunately, most callsites do not care at all whether the exit was from a code or from a signal; they merely check for a non-zero status, and sometimes propagate the error via exit(). But for the callers that do care, we can make life slightly easier by just using the consistent positive form. This actually fixes two minor bugs: 1. In launch_editor, we check whether the editor died from SIGINT or SIGQUIT. But we checked only the negative form, meaning that we would fail to notice a signal death exit code which was propagated through the shell. 2. In handle_alias, we assume that a negative return value from run_command means that errno tells us something interesting (like a fork failure, or ENOENT). Otherwise, we simply propagate the exit code. Negative signal death codes confuse us, and we print a useless "unable to run alias 'foo': Success" message. By encoding signal deaths using the positive form, the existing code just propagates it as it would a normal non-zero exit code. The downside is that callers of run_command can no longer differentiate between a signal received directly by the sub-process, and one propagated. However, no caller currently cares, and since we already optimize out some calls to the shell under the hood, that distinction is not something that should be relied upon by callers. Fix the same logic in t/test-terminal.perl for consistency [jc: raised by Jonathan in the discussion]. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Johannes Sixt <j6t@kdbg.org> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 19:09:18 UTC |
| 22f0dcd | René Scharfe | 05 January 2013, 22:49:54 UTC | archive-tar: split long paths more carefully The name field of a tar header has a size of 100 characters. This limit was extended long ago in a backward compatible way by providing the additional prefix field, which can hold 155 additional characters. The actual path is constructed at extraction time by concatenating the prefix field, a slash and the name field. get_path_prefix() is used to determine which slash in the path is used as the cutting point and thus which part of it is placed into the field prefix and which into the field name. It tries to cram as much into the prefix field as possible. (And only if we can't fit a path into the provided 255 characters we use a pax extended header to store it.) If a path is longer than 100 but shorter than 156 characters and ends with a slash (i.e. is for a directory) then get_path_prefix() puts the whole path in the prefix field and leaves the name field empty. GNU tar reconstructs the path without complaint, but the tar included with NetBSD 6 does not: It reports the header to be invalid. For compatibility with this version of tar, make sure to never leave the name field empty. In order to do that, trim the trailing slash from the part considered as possible prefix, if it exists -- that way the last path component (or more, but not less) will end up in the name field. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 06:56:36 UTC |
| 0398fc3 | Jeff King | 05 January 2013, 14:52:29 UTC | fix compilation with NO_PTHREADS Commit 1327452 cleaned up an unused parameter from wait_or_whine, but forgot to update a caller that is inside "#ifdef NO_PTHREADS". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 06:47:27 UTC |
| 9be1980 | Jens Lehmann | 05 January 2013, 20:17:04 UTC | clone: support atomic operation with --separate-git-dir Since b57fb80a7d (init, clone: support --separate-git-dir for .git file) git clone supports the --separate-git-dir option to create the git dir outside the work tree. But when that option is used, the git dir won't be deleted in case the clone fails like it would be without this option. This makes clone lose its atomicity as in case of a failure a partly set up git dir is left behind. A real world example where this leads to problems is when "git submodule update" fails to clone a submodule and later calls to "git submodule update" stumble over the partially set up git dir and try to revive the submodule from there, which then fails with a not very user friendly error message. Fix that by updating the junk_git_dir variable (used to remember if and what git dir should be removed in case of failure) to the new value given with the --seperate-git-dir option. Also add a test for this to t5600 (and while at it fix the former last test to not cd into a directory to test for its existence but use "test -d" instead). Reported-by: Manlio Perillo <manlio.perillo@gmail.com> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2013, 06:44:11 UTC |
| 3e4141d | Antoine Pelisse | 02 January 2013, 18:42:50 UTC | merge: Honor prepare-commit-msg return code 65969d4 (merge: honor prepare-commit-msg hook, 2011-02-14) tried to make "git commit" and "git merge" consistent, because a merge that required user assistance has to be concluded with "git commit", but back then only "git commit" triggered prepare-commit-msg hook. When it added a call to run the prepare-commit-msg hook, however, it forgot to check the exit code from the hook like "git commit" does, and ended up replacing one inconsistency with another. When prepare-commit-msg hook that is run from "git merge" exits with a non-zero status, abort the commit. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2013, 17:10:11 UTC |
| 81127d7 | Jeff King | 03 January 2013, 07:17:51 UTC | tests: turn on test-lint by default The test Makefile knows about a few "lint" checks for common errors. However, they are not enabled as part of "make test" by default, which means that many people do not bother running them. Since they are both quick to run and accurate (i.e., no false positives), there should be no harm in turning them on and helping submitters catch errors earlier. We could just set: TEST_LINT = test-lint to enable all tests. But that would be unnecessarily annoying later on if we add slower or less accurate tests that should not be part of the default. Instead, we name the tests individually. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2013, 16:03:46 UTC |
| 1226504 | Jonathan Nieder | 02 January 2013, 08:25:44 UTC | build: do not automatically reconfigure unless configure.ac changed Starting with v1.7.12-rc0~4^2 (build: reconfigure automatically if configure.ac changes, 2012-07-19), "config.status --recheck" is automatically run every time the "configure" script changes. In particular, that means the configuration procedure repeats whenever the version number changes (since the configure script changes to support "./configure --version" and "./configure --help"), making bisecting painfully slow. The intent was to make the reconfiguration process only trigger for changes to configure.ac's logic. Tweak the Makefile rule to match that intent by depending on configure.ac instead of configure. Reported-by: Martin von Zweigbergk <martinvonz@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 17:47:28 UTC |
| 92a865e | Junio C Hamano | 02 January 2013, 17:31:54 UTC | SubmittingPatches: give list and maintainer addresses We told readers to "send it to the list" (or the maintainer) without telling what addresses are to be used. Correct this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 17:31:54 UTC |
| 7d5bf87 | Junio C Hamano | 01 January 2013, 23:19:00 UTC | SubmittingPatches: remove overlong checklist The section is no longer a concise checklist. It also talks about things that are not covered in the "Long version" text, which means people need to read both, covering more or less the same thing in different phrasing. Fold the details into the main text and remove the section. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 17:31:09 UTC |
| 2797914 | Torsten Bögershausen | 01 January 2013, 21:42:03 UTC | t9020: which is not portable Use type instead Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 00:44:57 UTC |
| 6f4e505 | Torsten Bögershausen | 01 January 2013, 21:40:37 UTC | t9810: Do not use sed -i sed -i is not portable on all systems. Use sed with different input and output files. Utilize a tmp file whenever needed. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 00:40:34 UTC |
| 0e901d2 | Orgad Shaneh | 30 December 2012, 11:52:53 UTC | gitweb: fix error in sanitize when highlight is enabled $1 becomes undef by internal regex, since it has no capture groups. Match against accpetable control characters using index() instead of a regex. Signed-off-by: Orgad Shaneh <orgads@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 00:27:27 UTC |
| eb8c5b8 | Antoine Pelisse | 30 December 2012, 14:39:01 UTC | git-status: Test --ignored behavior Test all possible use-cases of git-status "--ignored" with the "--untracked-files" option with values "normal" and "all": - An untracked directory is listed as untracked if it has a mix of untracked and ignored files in it. With -uall, ignored/untracked files are listed as ignored/untracked. - An untracked directory with only ignored files is listed as ignored. With -uall, all files in the directory are listed. - An ignored directory is listed as ignored. With -uall, all files in the directory are listed as ignored. - An ignored and committed directory is listed as ignored if it has untracked files. With -uall, all untracked files in the directory are listed as ignored. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 00:24:48 UTC |
| 721ac4e | Antoine Pelisse | 30 December 2012, 14:39:00 UTC | dir.c: Make git-status --ignored more consistent The current behavior of git-status is inconsistent and misleading. Especially when used with --untracked-files=all option: - files ignored in untracked directories will be missing from status output. - untracked files in committed yet ignored directories are also missing. - with --untracked-files=normal, untracked directories that contains only ignored files are dropped too. Make the behavior more consistent across all possible use cases: - "--ignored --untracked-files=normal" doesn't show each specific files but top directory. It instead shows untracked directories that only contains ignored files, and ignored tracked directories with untracked files. - "--ignored --untracked-files=all" shows all ignored files, either because it's in an ignored directory (tracked or untracked), or because the file is explicitly ignored. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2013, 00:24:45 UTC |
| b5fb477 | Junio C Hamano | 01 January 2013, 20:46:15 UTC | Documentation: full-ness of a bundle is significant for cloning Not necessarily every bundle file can be cloned from. Only the ones that do not need prerequisites can. When 1d52b02 (Documentation: minor grammatical fixes and rewording in git-bundle.txt, 2009-03-22) reworded this paragraph, it lost a critical hint to tell readers why this particular bundle can be cloned from. Resurrect it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2013, 23:48:20 UTC |
| e6da8ee | Junio C Hamano | 01 January 2013, 22:37:56 UTC | SubmittingPatches: mention subsystems with dedicated repositories These were only mentioned in periodical "A note from the maintainer" posting and not in the documentation suite. SubmittingPatches has a section to help contributors decide on what commit to base their changes, which is the most suitable place for this information. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2013, 22:37:56 UTC |
| adcc42e | Junio C Hamano | 01 January 2013, 22:35:22 UTC | SubmittingPatches: who am I and who cares? The introductory text in the "long version" talks about the origin of this document with "I started ...", but it is unclear who that I is, and more importantly, it is not interesting how it was started. Just state the purpose of the document to help readers decide if it is releavant to them. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2013, 22:35:22 UTC |
