| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| ded6aa6 | Kirill Brilliantov | 01 January 2013, 13:54:44 UTC | Documentation: correct example restore from bundle Because the bundle created in the example does not record HEAD, "git clone" will not check out the files to the working tree: $ git clone pr.bundle q/ Cloning into 'q'... Receiving objects: 100% (619/619), 13.52 MiB | 18.74 MiB/s, done. Resolving deltas: 100% (413/413), done. warning: remote HEAD refers to nonexistent ref, unable to checkout. Avoid alarming the readers by adding "-b master" to the example. A better fix may be to arrange the bundle created in the earlier step to record HEAD, so that it can be cloned without this workaround. Signed-off-by: Brilliantov Kirill Vladimirovich <brilliantov@inbox.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2013, 20:43:02 UTC |
| 5d41784 | Junio C Hamano | 31 December 2012, 22:24:22 UTC | Git 1.8.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2012, 22:25:57 UTC |
| 9bcbb1c | Junio C Hamano | 28 December 2012, 23:29:31 UTC | merge --no-edit: do not credit people involved in the side branch The credit lines "By" and "Via" to credit authors and committers for their contributions on the side branch are meant as a hint to the integrator to decide whom to mention in the log message text. After the integrator saves the message in the editor, they are meant to go away and that is why they are commented out. When a merge is recorded without editing the generated message, however, its contents do not go through the normal stripspace() and these lines are left in the merge. Stop producing them when we know the merge is going to be recorded without editing, i.e. when --no-edit is given. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2012, 23:44:44 UTC |
| d16ece2 | Aaron Schrab | 28 December 2012, 23:03:06 UTC | Use longer alias names in subdirectory tests When testing aliases in t/t1020-subdirectory.sh use longer names so that they're less likely to conflict with a git-* command somewhere in the $PATH. I have a git-ss command in my path which prevents the 'ss' alias from being used. This command will always fail for git.git, causing the test to fail. Even if the command succeeded, that would be a false success for the test since the alias wasn't actually used. A longer, more descriptive name will make it much less likely that somebody has a command in their $PATH which will shadow the alias created for the test. While here, use a longer name for the 'test' alias as well since that is also short and meaningful enough to make it not unlikely that somebody would have a command in their $PATH which will shadow that as well. Signed-off-by: Aaron Schrab <aaron@schrab.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2012, 23:11:48 UTC |
| 3b73c7d | Junio C Hamano | 28 December 2012, 00:00:07 UTC | Merge branch 'so/prompt-command' Finishing touches... * so/prompt-command: make __git_ps1 accept a third parameter in pcmode | 28 December 2012, 00:00:07 UTC |
| 1b800f8 | Junio C Hamano | 27 December 2012, 23:59:42 UTC | Sync with 1.8.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:59:42 UTC |
| 1599999 | Junio C Hamano | 27 December 2012, 23:57:20 UTC | Git 1.8.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:57:20 UTC |
| 6ecc01f | Junio C Hamano | 12 December 2012, 18:06:24 UTC | git(1): show link to contributor summary page We earlier removed a link to list of contributors that pointed to a defunct page; let's use a working one from Ohloh.net to replace it instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:40:09 UTC |
| 2b05d9f | Junio C Hamano | 27 December 2012, 23:38:34 UTC | Merge branch 'sl/maint-git-svn-docs' into maint * sl/maint-git-svn-docs: git-svn: Note about tags. git-svn: Expand documentation for --follow-parent git-svn: Recommend use of structure options. git-svn: Document branches with at-sign(@). | 27 December 2012, 23:38:34 UTC |
| 008c208 | Sebastian Leske | 23 November 2012, 07:29:38 UTC | git-svn: Note about tags. Document that 'git svn' will import SVN tags as branches. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| 197a80d | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Expand documentation for --follow-parent Describe what the option --follow-parent does, and what happens if it is set or unset. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| 91583a6 | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Recommend use of structure options. Document that when using git svn, one should usually either use the directory structure options to import branches as branches, or only import one subdirectory. The default behaviour of cloning all branches and tags as subdirectories in the working copy is usually not what the user wants. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| d658835 | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Document branches with at-sign(@). git svn sometimes creates branches with an at-sign in the name (branchname@revision). These branches confuse many users and it is a FAQ why they are created. Document when git svn creates them. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| 4017edc | Junio C Hamano | 27 December 2012, 23:34:37 UTC | Merge branch 'gb/maint-doc-svn-log-window-size' into maint * branch 'gb/maint-doc-svn-log-window-size': Document git-svn fetch --log-window-size parameter | 27 December 2012, 23:34:37 UTC |
| 8c6bda0 | Junio C Hamano | 27 December 2012, 23:32:27 UTC | Merge branch 'km/maint-doc-git-reset' into maint * branch 'km/maint-doc-git-reset': doc: git-reset: make "<mode>" optional | 27 December 2012, 23:32:27 UTC |
| 6cf9614 | Max Horn | 27 November 2012, 23:03:21 UTC | git-remote-helpers.txt: document invocation before input format In the distant past, the order things were documented was 'Invocation', 'Commands', 'Capabilities', ... Then it was decided that before giving a list of Commands, there should be an overall description of the 'Input format', which was a wise decision. However, this description was put as the very first thing, with the rationale that any implementor would want to know that first. However, it seems an implementor would actually first need to know how the remote helper will be invoked, so moving 'Invocation' to the front again seems logical. Moreover, we now don't switch from discussing the input format to the invocation style and then back to input related stuff. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:30:14 UTC |
| 0a1b59e | Junio C Hamano | 27 December 2012, 23:27:46 UTC | Merge branch 'jk/avoid-mailto-invalid-in-doc' into maint * jk/avoid-mailto-invalid-in-doc: Documentation: don't link to example mail addresses | 27 December 2012, 23:27:46 UTC |
| 4f96f1f | Junio C Hamano | 27 December 2012, 23:24:51 UTC | Merge branch 'tj/maint-doc-commit-sign' into maint * branch 'tj/maint-doc-commit-sign': Add -S, --gpg-sign option to manpage of "git commit" | 27 December 2012, 23:25:03 UTC |
| 0b830ac | Ramkumar Ramachandra | 13 November 2012, 15:42:44 UTC | Documentation: move diff.wordRegex from config.txt to diff-config.txt 19299a8 (Documentation: Move diff.<driver>.* from config.txt to diff-config.txt, 2011-04-07) moved the diff configuration options to diff-config.txt, but forgot about diff.wordRegex, which was left behind in config.txt. Fix this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:21:46 UTC |
| 0a85441 | Thomas Ackermann | 27 December 2012, 14:15:52 UTC | Remove Documentation/pt_BR/gittutorial.txt This file is rather outdated and IMHO shouldn't be there in the first place. (If there are translations of the Git documentation they are better be kept separate from the original documentation.) Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 16:42:33 UTC |
| 126b596 | Simon Oosthoek | 26 December 2012, 19:15:05 UTC | make __git_ps1 accept a third parameter in pcmode The optional third parameter when __git_ps1 is used in PROMPT_COMMAND mode as format string for printf to further customize the way the git status string is embedded in the user's PS1 prompt. Signed-off-by: Simon Oosthoek <s.oosthoek@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2012, 19:52:36 UTC |
| 8666df0 | Junio C Hamano | 25 December 2012, 01:09:49 UTC | t9200: let "cvs init" create the test repository Some platforms (e.g. NetBSD 6.0) seem to configure their CVS to allow "cvs init" in an existing directory only to members of "cvsadmin". Instead of preparing an empty directory and then running "cvs init" on it, let's run "cvs init" and let it create the necessary directory. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 December 2012, 01:42:07 UTC |
| 86c3e6e | Junio C Hamano | 23 December 2012, 04:40:07 UTC | Merge branch 'maint' | 23 December 2012, 04:40:07 UTC |
| c2999ad | Junio C Hamano | 23 December 2012, 04:38:07 UTC | Merge branch 'jc/doc-diff-blobs' into maint * jc/doc-diff-blobs: Documentation: Describe "git diff <blob> <blob>" separately | 23 December 2012, 04:38:07 UTC |
| a7b5e91 | Junio C Hamano | 23 December 2012, 04:38:02 UTC | Merge branch 'cr/doc-checkout-branch' into maint * cr/doc-checkout-branch: Documentation/git-checkout.txt: document 70c9ac2 behavior Documentation/git-checkout.txt: clarify usage | 23 December 2012, 04:38:02 UTC |
| 2b19658 | Junio C Hamano | 23 December 2012, 04:37:42 UTC | Merge branch 'ta/api-index-doc' into maint * ta/api-index-doc: Remove misleading date from api-index-skel.txt | 23 December 2012, 04:37:42 UTC |
| ffcd76b | Junio C Hamano | 23 December 2012, 04:37:33 UTC | Merge branch 'as/doc-for-devs' into maint * as/doc-for-devs: Documentation: move support for old compilers to CodingGuidelines SubmittingPatches: add convention of prefixing commit messages | 23 December 2012, 04:37:33 UTC |
| e970ec3 | Junio C Hamano | 23 December 2012, 04:37:27 UTC | Merge branch 'sl/readme-gplv2' into maint * sl/readme-gplv2: README: it does not matter who the current maintainer is README: Git is released under the GPLv2, not just "the GPL" | 23 December 2012, 04:37:27 UTC |
| 21b3401 | Junio C Hamano | 23 December 2012, 04:37:22 UTC | Merge branch 'jc/fetch-tags-doc' into maint * jc/fetch-tags-doc: fetch --tags: clarify documentation | 23 December 2012, 04:37:22 UTC |
| df54d59 | Junio C Hamano | 23 December 2012, 04:37:09 UTC | Merge branch 'nd/index-format-doc' into maint * nd/index-format-doc: index-format.txt: clarify what is "invalid" | 23 December 2012, 04:37:09 UTC |
