cbcab75 | Junio C Hamano | 02 December 2010, 20:06:06 UTC | Git 1.7.0.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 20:13:27 UTC |
6b3020a | Jonathan Nieder | 01 December 2010, 18:36:15 UTC | add: introduce add.ignoreerrors synonym for add.ignore-errors 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> | 01 December 2010, 21:40:12 UTC |
593ce2b | Junio C Hamano | 27 July 2010, 21:07:41 UTC | Git 1.7.0.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 21:09:11 UTC |
79bf149 | Jonathan Nieder | 26 July 2010, 15:06:51 UTC | config --get --path: check for unset $HOME If $HOME is unset (as in some automated build situations), currently git config --path path.home "~" git config --path --get path.home segfaults. Error out with Failed to expand user dir in: '~/' instead. Reported-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 17:58:46 UTC |
28bf4ba | Junio C Hamano | 26 July 2010, 04:52:48 UTC | Merge branch 'maint-1.6.6' into maint-1.7.0 * maint-1.6.6: request-pull.txt: Document -p option Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:52:48 UTC |
ad33605 | Junio C Hamano | 26 July 2010, 04:52:29 UTC | Merge branch 'maint-1.6.5' into maint-1.6.6 * maint-1.6.5: request-pull.txt: Document -p option Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:52:29 UTC |
d8e3ac7 | Stephen Boyd | 23 July 2010, 16:31:27 UTC | request-pull.txt: Document -p option Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 04:52:19 UTC |
a07b10c | Junio C Hamano | 26 July 2010, 04:51:58 UTC | Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:51:58 UTC |
1b0b962 | Greg Brockman | 20 July 2010, 04:46:21 UTC | Check size of path buffer before writing into it This prevents a buffer overrun that could otherwise be triggered by creating a file called '.git' with contents gitdir: (something really long) Signed-off-by: Greg Brockman <gdb@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2010, 17:33:47 UTC |
2998138 | Uwe Kleine-König | 06 July 2010, 14:46:05 UTC | rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option The ?: operator has a lower priority than |, so the implicit associativity made the 6th argument of parse_options be PARSE_OPT_KEEP_DASHDASH if keep_dashdash was true discarding PARSE_OPT_STOP_AT_NON_OPTION and PARSE_OPT_SHELL_EVAL. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2010, 18:11:50 UTC |
4b2343f | Michael J Gruber | 20 May 2010, 15:55:42 UTC | Documentation/config: describe status.submodulesummary ac8d5af (builtin-status: submodule summary support, 2008-04-12) intoduced this variable and described it in git-status[1]. Include this description in git-config[1], as well. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2010, 01:26:33 UTC |
70b89f8 | Michael J Gruber | 26 May 2010, 14:24:34 UTC | Makefile: reenable install with NO_CURL Setting NO_CURL leaves some variables like REMOTE_CURL_ALIASES empty, which creates no fun when for-looping over $(REMOTE_CURL_ALIASES) unconditionally. Make it conditional. Reported-by: Paul Walker <PWalker752@aol.com> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2010, 23:46:09 UTC |
dfea790 | René Scharfe | 04 May 2010, 20:41:34 UTC | remove ecb parameter from xdi_diff_outf() xdi_diff_outf() overrides the structure members of its last parameter, ignoring any value that callers pass in. It's no surprise then that all callers pass a pointer to an uninitialized structure. They also don't read it after the call, so the parameter is neither used for input nor for output. Turn it into a local variable of xdi_diff_outf(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2010, 22:19:14 UTC |
ed215b1 | Michael J Gruber | 29 April 2010, 15:42:47 UTC | index-pack: fix trivial typo in usage string Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2010, 18:58:37 UTC |
48bb303 | Gerrit Pape | 26 April 2010, 09:50:39 UTC | git-submodule.sh: properly initialize shell variables git-submodule inherits variables from the environment it is started in, expects the internal variables init= and recursive= to have an empty value, but doesn't initialize them appropriately. Thanks to the selftests, this can be reproduced through init=1 make test recursive=1 make test With this commit the variables are initialized, and the selftests succeed even if these variables have some values in the environment. The bug was discovered through the Debian autobuilders http://bugs.debian.org/569594 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2010, 18:11:52 UTC |
e92e9cd | Eric Raymond | 23 April 2010, 17:40:15 UTC | Documentation improvements for the description of short format. Incorporates the detailed explanation from Jeff King in <20100410040959.GA11977@coredump.intra.peff.net> and fixes the bug noted by Junio C Hamano in <7vmxxc1i8g.fsf@alter.siamese.dyndns.org>. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2010, 19:33:41 UTC |
66cfd10 | Junio C Hamano | 23 April 2010, 05:46:24 UTC | Git 1.7.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2010, 06:04:21 UTC |
5deb15e | Junio C Hamano | 23 April 2010, 05:39:26 UTC | Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint * mg/use-default-abbrev-length-in-rev-list: rev-list: use default abbrev length when abbrev-commit is in effect | 23 April 2010, 05:39:26 UTC |
0737975 | Junio C Hamano | 23 April 2010, 05:29:50 UTC | Merge branch 'wp/doc-filter-direction' into maint * wp/doc-filter-direction: documentation: clarify direction of core.autocrlf | 23 April 2010, 05:29:50 UTC |
4fd8145 | Junio C Hamano | 23 April 2010, 05:29:13 UTC | Merge branch 'jk/maint-diffstat-overflow' into maint * jk/maint-diffstat-overflow: diff: use large integers for diffstat calculations | 23 April 2010, 05:29:13 UTC |
dd0c513 | Junio C Hamano | 23 April 2010, 05:29:07 UTC | Merge branch 'da/maint-python-startup' into maint * da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method | 23 April 2010, 05:29:07 UTC |
f9dae0d | Jonathan Nieder | 22 April 2010, 01:18:21 UTC | Documentation/Makefile: fix interrupted builds of user-manual.xml Unlike gcc, asciidoc does not atomically write its output file or delete it when interrupted. If it is interrupted in the middle of writing an XML file, the result will be truncated input for xsltproc. XSLTPROC user-manual.html user-manual.xml:998: parser error : Premature end of data in t Take care of this case by writing to a temporary and renaming it when finished. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2010, 06:46:51 UTC |
3d81676 | Michael J Gruber | 19 April 2010, 08:14:32 UTC | t7012: Mark missing tests as TODO Currently, there are 6 tests which are not even written but are 'test_expect_failure message false'. Do not abuse test_expect_failure as a to do marker, but mark them as '#TODO' instead. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2010, 01:05:00 UTC |
580b7d3 | SZEDER Gábor | 19 April 2010, 09:52:30 UTC | reflog: remove 'show' from 'expire's usage string Most of 'expire's options are not recognized by the 'show' subcommand, hence it errors out. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2010, 00:52:14 UTC |
8165952 | Junio C Hamano | 19 April 2010, 08:28:27 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: MSVC: Fix build by adding missing termios.h dummy | 19 April 2010, 08:28:27 UTC |
b756864 | Johannes Sixt | 19 April 2010, 07:37:20 UTC | MSVC: Fix build by adding missing termios.h dummy A use of this header file was introduced in eb80042 (Add missing #include to support TIOCGWINSZ on Solaris, 2010-01-11). Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2010, 08:28:21 UTC |
03aa87e | Charles Bailey | 18 April 2010, 18:28:17 UTC | Documentation: Describe other situations where -z affects git diff -z also alters the behaviour of --name-only and --name-status. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:43:53 UTC |
c308b9c | Will Palmer | 17 April 2010, 16:55:26 UTC | documentation: clarify direction of core.autocrlf The description for core.autocrlf refers to reads from / writes to "the filesystem", the only use of this rather ambiguous term, which technically could be referring to the git object database. (All other mentions are part of phrases such as "..filesystems (like NFS).."). Other sections, including the section on core.safecrlf, use the term "work tree" for the same purpose as the term "the filesystem" is used in the core.autocrlf section, so that seems like a good alternative, which makes it clearer what direction the addition/removal of CR characters occurs in. Signed-off-by: Will Palmer <wmpalmer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 18:50:32 UTC |
0974c11 | Jeff King | 17 April 2010, 17:41:08 UTC | diff: use large integers for diffstat calculations The diffstat "added" and "changed" fields generally store line counts; however, for binary files, they store file sizes. Since we store and print these values as ints, a diffstat on a file larger than 2G can show a negative size. Instead, let's use uintmax_t, which should be at least 64 bits on modern platforms. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 18:30:21 UTC |
53b3c47 | Michael J Gruber | 15 April 2010, 09:34:07 UTC | t1010-mktree: Adjust expected result to code and documentation The last two tests here were always supposed to fail in the sense that, according to code and documentation, mktree should read non-recursive ls-tree output, but not recursive one, and therefore explicitely refuses to deal with slashes. Adjust the test (must_fail) so that it succeeds when mktree dies on slashes. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 17:30:00 UTC |
2179870 | Thomas Rast | 15 April 2010, 12:59:37 UTC | combined diff: correctly handle truncated file Consider an evil merge of two commits A and B, both of which have a file 'foo', but the merge result does not have that file. The combined-diff code learned in 4462731 (combine-diff: do not punt on removed or added files., 2006-02-06) to concisely show only the removal, since that is the evil part and the previous contents are presumably uninteresting. However, to diagnose an empty merge result, it overloaded the variable that holds the file's length. This means that the check also triggers for truncated files. Consequently, such files were not shown in the diff at all despite the merge being clearly evil. Fix this by adding a new variable that distinguishes whether the file was deleted (which is the case 4462731 handled) or truncated. In the truncated case, we show the full combined diff again, which is rather spammy but at least does not hide the evilness. Reported-by: David Martínez Martí <desarrollo@gestiweb.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 17:23:59 UTC |
fff0d0a | Jonathan Nieder | 15 April 2010, 07:25:38 UTC | Document new "already-merged" rule for branch -d v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic for when it is safe to delete a branch without forcing the issue. It is safe to delete a branch "topic" without second thought if: - the branch "topic" is set up to pull from a (remote-tracking, usually) branch and is fully merged in that "upstream" branch, or - there is no branch.topic.merge configuration and branch "topic" is fully merged in the current HEAD. Update the man page to acknowledge the new rules. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2010, 07:53:40 UTC |
f78683f | Jay Soffian | 13 April 2010, 16:52:55 UTC | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 The default for gc.aggressiveWindow has been 250 since 1c192f3 (gc --aggressive: make it really aggressive, 2007-12-06). Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2010, 19:27:19 UTC |
adda3c3 | Marc Branchaud | 12 April 2010, 16:28:13 UTC | Docs: Add -X option to git-merge's synopsis. Also move -X's description next to -s's in merge-options.txt. This makes it easier to learn how to specify merge strategy options. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2010, 16:50:09 UTC |
fcd4240 | Junio C Hamano | 11 April 2010, 20:41:43 UTC | Git 1.7.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 20:42:33 UTC |
c512b03 | Junio C Hamano | 11 April 2010, 20:39:47 UTC | Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint * rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations | 11 April 2010, 20:39:47 UTC |
d8c416b | Junio C Hamano | 11 April 2010, 19:17:42 UTC | blame documentation: -M/-C notice copied lines as well as moved ones Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 19:17:42 UTC |
54fd955 | Jens Lehmann | 09 April 2010, 20:08:35 UTC | Let check_preimage() use memset() to initialize "struct checkout" Every code site except check_preimage() uses either memset() or declares a static instance of "struct checkout" to achieve proper initialization. Lets use memset() instead of explicit initialization of all members here too to be on the safe side in case this structure is expanded someday. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2010, 05:42:57 UTC |
408dee5 | Junio C Hamano | 10 April 2010, 05:38:53 UTC | Merge branch 'ef/maint-empty-commit-log' into maint * ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message | 10 April 2010, 05:38:53 UTC |
daaf2e8 | Junio C Hamano | 10 April 2010, 05:38:34 UTC | Merge branch 'jc/conflict-marker-size' into maint * jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute | 10 April 2010, 05:38:34 UTC |
326bea4 | Junio C Hamano | 10 April 2010, 05:38:16 UTC | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maint * sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die() | 10 April 2010, 05:38:16 UTC |
fe7e372 | Junio C Hamano | 10 April 2010, 05:23:04 UTC | Merge branch 'mg/maint-send-email-lazy-editor' into maint * mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable | 10 April 2010, 05:23:04 UTC |
2e5a40f | Junio C Hamano | 10 April 2010, 05:22:44 UTC | Merge branch 'rr/imap-send-unconfuse-from-line' into maint * rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body | 10 April 2010, 05:22:44 UTC |
581b26c | Junio C Hamano | 10 April 2010, 05:22:19 UTC | Merge branch 'rb/maint-python-path' into maint * rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD | 10 April 2010, 05:22:19 UTC |
5d4bd79 | Junio C Hamano | 10 April 2010, 05:22:14 UTC | Merge branch 'gh/maint-stash-show-error-message' into maint * gh/maint-stash-show-error-message: Improve error messages from 'git stash show' | 10 April 2010, 05:22:14 UTC |
e80014a | Junio C Hamano | 10 April 2010, 05:22:06 UTC | Merge branch 'mg/mailmap-update' into maint * mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela | 10 April 2010, 05:22:06 UTC |
2870695 | Junio C Hamano | 10 April 2010, 05:22:00 UTC | Merge branch 'bc/maint-daemon-sans-ss-family' into maint * bc/maint-daemon-sans-ss-family: daemon.c: avoid accessing ss_family member of struct sockaddr_storage | 10 April 2010, 05:22:00 UTC |
e3163c7 | Tay Ray Chuan | 10 April 2010, 02:50:19 UTC | fetch/push: fix usage strings - use "<options>" instead of just "options". - use "[<repository> [<refspec>...]]" to indicate that <repository> and <refspec> are optional, and that <refspec> cannot be specified without specifying <repository>. Note that when called without specifying <repository> (eg. "git fetch -f"), it is accurate to say that the "git fetch [<options>] [<repository> ...]" case takes precedence over "git fetch [<options>] <group>". Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2010, 04:23:10 UTC |
936db18 | Tay Ray Chuan | 09 April 2010, 12:38:18 UTC | branch: say "Reset to" in reflog entries for 'git branch -f' operations In 5f856dd (fix reflog entries for "git-branch"), it is mentioned that 'git branch -f' is intended to be equivalent to 'git reset'. Since we usually say "reset to <commit>" in the git-reset Documentation and elsewhere, it would make sense to say "Reset to" here as well, instead of "Reset from" previously. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2010, 03:40:54 UTC |
4c35f0d | Jeff King | 08 April 2010, 19:49:08 UTC | docs: clarify "branch -l" This option is mostly useless these days because we turn on reflogs by default in non-bare repos. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2010, 20:42:36 UTC |
c8a9790 | Tay Ray Chuan | 04 April 2010, 13:12:17 UTC | pack-protocol.txt: fix pkt-line lengths Previously, the lengths were 4-bytes short. Fix it such that the lengths reflect the total length of the pkt-line, as per spec. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2010, 17:18:21 UTC |
8e50175 | Tay Ray Chuan | 04 April 2010, 13:12:16 UTC | pack-protocol.txt: fix spelling s/paramater/parameter/. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2010, 17:18:19 UTC |
2be10bb | Junio C Hamano | 31 March 2010, 22:12:08 UTC | Git 1.7.0.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 22:12:08 UTC |
970957d | Junio C Hamano | 31 March 2010, 22:09:32 UTC | Merge branch 'jc/maint-refs-dangling' into maint * jc/maint-refs-dangling: refs: ref entry with NULL sha1 is can be a dangling symref | 31 March 2010, 22:09:32 UTC |
4318d3b | Holger Weiß | 29 March 2010, 11:02:37 UTC | Documentation: show-ref <pattern>s are optional Specifying one or more <pattern> parameters is optional when calling show-ref, so mark them as such using brackets in the manual. Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 21:22:17 UTC |
2170422 | Holger Weiß | 29 March 2010, 10:57:48 UTC | Link against libiconv on IRIX On IRIX, "-liconv" must be added to the linker command line in order to get iconv(3) support; set the according Makefile variable appropriately. Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 21:22:06 UTC |
21e403a | Holger Weiß | 29 March 2010, 10:22:19 UTC | Don't redefine htonl and ntohl on big-endian Since commit 0fcabdeb52b79775173d009ccc179db104dfbb66, compat/bswap.h redefined htonl and ntohl to bswap32 not only if bswap32 has been defined earlier in compat/bswap.h (which is done only on selected platforms), but also if bswap32 has been defined anywhere else. This broke Git at least for NetBSD systems running on big-endian machines (where ntohl and htonl should, of course, be NOOPs), since NetBSD defines a bswap32 macro in the system headers. So, we now undefine any previously defined bswap32 in compat/bswap.h before defining our own. Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 21:21:39 UTC |
7a49c25 | Jakub Narebski | 27 March 2010, 19:26:59 UTC | gitweb: git_get_project_config requires only $git_dir, not also $project Fix overeager early return in git_get_project_config, introduced in 9be3614 (gitweb: Fix project-specific feature override behavior, 2010-03-01). When git_get_project_config is called from projects list page via git_get_project_owner($path) etc., it is called with $git_dir defined (in git_get_project_owner($path) etc.), but $project variable is not defined. git_get_project_config doesn't use $project variable anyway. Reported-by: Tobias Heinlein <keytoaster@gentoo.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 17:57:04 UTC |
e476286 | Jan Stępień | 31 March 2010, 09:24:19 UTC | Updated the usage string of git reset Make git reset usage string reflect the command's behaviour and contents of the man page. Signed-off-by: Jan Stępień <jstepien@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 15:15:02 UTC |
09f53b1 | Greg Bacon | 30 March 2010, 17:20:57 UTC | Documentation: Clarify support for smart HTTP backend In the description of http.getanyfile, replace the vague "older Git clients" with the earliest release whose client is able to use the upload pack service. Signed-off-by: Greg Bacon <gbacon@dbresearch.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 23:49:19 UTC |
852f098 | Johannes Sixt | 30 March 2010, 07:46:23 UTC | Windows: fix utime() for read-only files Starting with 5256b00 (Use git_mkstemp_mode instead of plain mkstemp to create object files, 2010-02-22) utime() is invoked on read-only files. This is not allowed on Windows and results in many warnings of the form failed utime() on .git/objects/23/tmp_obj_VlgHlc: Permission denied during a repack. Fix it by making the file temporarily writable. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 23:34:04 UTC |
da1fbed | Johannes Sixt | 30 March 2010, 17:36:03 UTC | diff: fix textconv error zombies To make the code simpler, run_textconv lumps all of its error checking into one conditional. However, the short-circuit means that an error in reading will prevent us from calling finish_command, leaving a zombie child. Clean up properly after errors. Based-on-work-by: Jeff King <peff@peff.net> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 21:46:33 UTC |
657ab61 | Kevin Ballard | 30 March 2010, 02:46:38 UTC | format-patch: Squelch 'fatal: Not a range." error Don't output an error on `git format-patch --ignore-if-in-upstream HEAD`. This matches the behavior of `git format-patch HEAD`. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 04:22:37 UTC |
0ae0840 | David Aguilar | 28 March 2010, 00:45:12 UTC | Makefile: Remove usage of deprecated Python "has_key" method "has_key" is a deprecated dictionary method in Python 2.6+. Simplify the sys.path manipulation for installed scripts by passing a default value to os.getenv() that takes a default value to be used when the environment variable is missing. SCRIPT_PYTHON is currently empty but this future-proofs us. It also fixes things for users who maintain local git forks with their own SCRIPT_PYTHON additions. Old code replaced the first element of sys.path[] which is typically '' (i.e. import library files relative to the script). It is safer to prepend the extra library path instead. Signed-off-by: David Aguilar <davvid@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 04:35:09 UTC |
e07665e | Junio C Hamano | 29 March 2010, 04:32:25 UTC | Prepare for 1.7.0.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 04:32:25 UTC |
cc64c69 | Junio C Hamano | 29 March 2010, 04:21:42 UTC | Merge branch 'cp/add-u-pathspec' into maint * cp/add-u-pathspec: test for add with non-existent pathspec git add -u: die on unmatched pathspec | 29 March 2010, 04:21:42 UTC |
4c367c6 | Junio C Hamano | 29 March 2010, 00:42:11 UTC | t9350: fix careless use of "cd" Upon failure of any of these tests (or when a test that is marked as expecting a failure is fixed), we will end up running later tests in random places. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 00:42:11 UTC |
42accae | David Aguilar | 27 March 2010, 21:58:09 UTC | difftool: Fix '--gui' when diff.guitool is unconfigured When diff.guitool is unconfigured and "--gui" is specified git-difftool dies with the following error message: config diff.guitool: command returned error: 1 Catch the error so that the "--gui" flag is a no-op when diff.guitool is unconfigured. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2010, 16:29:12 UTC |
bb6ad28 | Sverre Rabbelier | 28 March 2010, 05:42:48 UTC | fast-export: don't segfault when marks file cannot be opened The error function only prints an error message, resulting in a segfault if we later on try to fprintf to a NULL handle. Fix this by using die_errno instead. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2010, 16:26:16 UTC |
0ce142c | Michael J Gruber | 22 March 2010, 16:12:53 UTC | send-email: lazily assign editor variable b4479f0 (add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR", 2009-10-30) introduced the use of "git var GIT_EDITOR" to obtain the preferred editor program, instead of reading environment variables themselves. However, "git var GIT_EDITOR" run without a tty (think "cron job") would give a fatal error "Terminal is dumb, but EDITOR unset". This is not a problem for add-i, svn, p4 and callers of git_editor() defined in git-sh-setup, as all of these call it just before launching the editor. At that point, we know the caller wants to edit. But send-email ran this near the beginning of the program, even if it is not going to use any editor (e.g. run without --compose). Fix this by calling the command only when we edit a file. Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 10:07:31 UTC |
a757c64 | Junio C Hamano | 25 March 2010, 02:21:32 UTC | diff --check: honor conflict-marker-size attribute Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:35:34 UTC |
0476228 | Junio C Hamano | 24 March 2010, 23:24:13 UTC | Merge branch 'jc/color-attrs' into maint * jc/color-attrs: color: allow multiple attributes | 24 March 2010, 23:24:13 UTC |
bcbbe4f | Junio C Hamano | 24 March 2010, 23:24:03 UTC | Merge branch 'jk/maint-add-ignored-dir' into maint * jk/maint-add-ignored-dir: tests for "git add ignored-dir/file" without -f dir: fix COLLECT_IGNORED on excluded prefixes t0050: mark non-working test as such | 24 March 2010, 23:24:03 UTC |
7b676b1 | Junio C Hamano | 24 March 2010, 23:23:50 UTC | Merge branch 'bg/apply-fix-blank-at-eof' into maint * bg/apply-fix-blank-at-eof: t3417: Add test cases for "rebase --whitespace=fix" t4124: Add additional tests of --whitespace=fix apply: Allow blank context lines to match beyond EOF apply: Remove the quick rejection test apply: Don't unnecessarily update line lengths in the preimage | 24 March 2010, 23:23:50 UTC |
5856b5f | Shawn O. Pearce | 22 March 2010, 14:22:04 UTC | http-backend: Don't infinite loop during die() If stdout has already been closed by the CGI and die() gets called, the CGI will fail to write the "Status: 500 Internal Server Error" to the pipe, which results in die() being called again (via safe_write). This goes on in an infinite loop until the stack overflows and the process is killed by SIGSEGV. Instead set a flag on the first die() invocation and if we came back to the handler, just die silently, as it only means we failed to report the failure---we cannot report anything anyway in such a case. This way failures to write the error messages to the stdout pipe do not result in an infinite loop. We also now report on the death to stderr before we report to stdout, to increase the chances that the cause of the die() invocation will appear in the server's error log. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> fixup! http-backend.c: Don't infinite loop Now die_webcgi() actually can return during a recursive call into it, causing http-backend.c:554: error: 'noreturn' function does return The only reason we would come back to the die handler is because we failed during it, so we cannot report anything anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 21:40:56 UTC |
44211e8 | R. Tyler Ballance | 21 March 2010, 19:01:50 UTC | Correct references to /usr/bin/python which does not exist on FreeBSD On FreeBSD, Python does not ship as part of the base system but is available via the ports system, which install the binary in /usr/local/bin. Signed-off-by: R. Tyler Ballance <tyler@monkeypox.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 21:33:54 UTC |
846b8f6 | Markus Heidelberg | 22 March 2010, 20:45:33 UTC | Documentation: explain the meaning of "-g" in git-describe output Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 18:31:45 UTC |
7337b13 | Michael J Gruber | 22 March 2010, 13:36:30 UTC | rev-list: use default abbrev length when abbrev-commit is in effect Currently, rev-list has a default of "0" for abbrev which means that switching on abbreviations with --abbrev-commit has no visible effect, even though the option is documented. Set abbrev to DEFAULT_ABBREV so that --abbrev-commit has the same effect as for log. Reported-by: Eli Barzilay <eli@barzilay.org> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 18:11:58 UTC |
4916c8f | Ramkumar Ramachandra | 22 March 2010, 18:07:52 UTC | imap-send: Remove limitation on message body There is a documented limitation on the body of any email not being able to contain lines starting with "From ". This patch removes that limitation by improving the parser to search for "From", "Date", and "Subject" fields in the email before considering it to be an email. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 18:00:25 UTC |
0b3dcfe | Junio C Hamano | 22 March 2010, 00:01:22 UTC | Git 1.7.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2010, 00:01:22 UTC |
d16a5da | Junio C Hamano | 22 March 2010, 00:00:22 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: Documentation/git-clone: Transform description list into item list Documentation/urls: Remove spurious example markers Documentation/gitdiffcore: Remove misleading date in heading Documentation/git-reflog: Fix formatting of command lists | 22 March 2010, 00:00:22 UTC |
11f5498 | Michael J Gruber | 21 March 2010, 13:43:47 UTC | .mailmap: Map the the first submissions of MJG by e-mail so that git shortlog with '-e' coalesces all my commits. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 23:30:17 UTC |
4763868 | Michael J Gruber | 21 March 2010, 17:30:19 UTC | Documentation/git-clone: Transform description list into item list so that the list of examples is formatted in the same way as for git-fetch, and, more importantly, the different identation for the code blocks in the examples (compared to the immediately preceding code blocks from url.txt) doesn't look like misformatted, but is clarified by the items' bullets. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:45:05 UTC |
a3cfb7f | Michael J Gruber | 21 March 2010, 17:30:18 UTC | Documentation/urls: Remove spurious example markers In urls.txt (which is included from git-{clone,fetch,push}.txt) several item lists are surrounded by example block markers. This is problematic for two reasons: - None of these lists are example lists, so they should not be marked as such semantically. - The html output looks weird (bulleted list with left sidebar). Therefore, remove the example block markers. Output by the man backend is unaffected. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:42:24 UTC |
dddfb3f | Michael J Gruber | 21 March 2010, 17:30:17 UTC | Documentation/gitdiffcore: Remove misleading date in heading Ever since the automatic conversion into man form, the heading contained a misidentified subheading reading "June 2005". Remove this since the documentation is more recent, and the correct date is in the footer. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:40:18 UTC |
b6c7c41 | Michael J Gruber | 21 March 2010, 17:30:16 UTC | Documentation/git-reflog: Fix formatting of command lists A misplaced list continuation mark appears literally in the rendered doc. Fix this by removing it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:40:02 UTC |
1fb5fdd | Erik Faye-Lund | 21 March 2010, 14:40:16 UTC | rev-list: fix --pretty=oneline with empty message 55246aa (Dont use "<unknown>" for placeholders and suppress printing of empty user formats) introduced a check to prevent empty user-formats from being printed. This test didn't take empty commit messages into account, and prevented the line-termination from being output. This lead to multiple commits on a single line. Correct it by guarding the check with a check for user-format. A similar correction for the --graph code-path has been included. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 18:44:27 UTC |
08bb03e | Michael J Gruber | 19 March 2010, 11:02:04 UTC | .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela With the current .mailmap, git shortlog shows the following for these: 11 Deskin Miller 3 Vitaly \"_Vi\" Shukela 1 Alex Bennee 1 Alex Bennée 1 Deskin Miler 1 Vitaly _Vi Shukela Add (e-mail based qualified) entries to .mailmap to get: 12 Deskin Miller 4 Vitaly "_Vi" Shukela 2 Alex Bennée The Shukela spelling is based on the version used consistently in the s-o-b lines of all his patches. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 02:26:35 UTC |
8fe5d87 | Junio C Hamano | 20 March 2010, 18:29:13 UTC | Update draft release notes to 1.7.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2010, 18:29:13 UTC |
730b020 | Andreas Gruenbacher | 15 March 2010, 22:18:48 UTC | fetch: Fix minor memory leak A temporary struct ref is allocated in store_updated_refs() but not freed. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2010, 16:28:48 UTC |
8da61a2 | Andreas Gruenbacher | 12 March 2010, 22:27:33 UTC | fetch: Future-proof initialization of a refspec on stack The open-coded version to initialize each and every member will break when a new member is added to the structure. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2010, 16:27:17 UTC |
aac1d7b | Andreas Gruenbacher | 13 March 2010, 17:17:04 UTC | fetch: Check for a "^{}" suffix with suffixcmp() Otherwise, we will check random bytes for ref names < 3 characters. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2010, 16:25:25 UTC |
e9bd323 | Imre Deak | 20 March 2010, 02:23:58 UTC | daemon: parse_host_and_port SIGSEGV if port is specified This typo will lead to git-daemon dying any time the connect string includes a port after the host= attribute. This can lead for example to one of the following error messages on the client side when someone tries git clone git://...:<port>. When the daemon is running on localhost: fatal: The remote end hung up unexpectedly or when the daemon is connected through an ssh tunnel: fatal: protocol error: bad line length character: erro In the latter case 'erro' comes from the daemon's reply: error: git-daemon died of signal 11 Signed-off-by: Imre Deak <imre.deak@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2010, 15:49:31 UTC |
c40d92e | Jonathan Nieder | 20 March 2010, 00:06:15 UTC | Makefile: Fix CDPATH problem If CDPATH is set, "cd" prints its destination to stdout, causing the common (cd a && tar cf - .) | (cd b && tar xf -) idiom to fail. For example: make -C templates DESTDIR='' install make[1]: Entering directory `/users/e477610/exptool/src/git-1.7.0.2/templates' install -d -m 755 '/home/e477610/exptool/share/git-core/templates' (cd blt && gtar cf - .) | \ (cd '/home/e477610/exptool/share/git-core/templates' && umask 022 && gtar xof -) gtar: This does not look like a tar archive Most git scripts already protect against use of CDPATH through git-sh-setup, but the Makefile doesn’t. Reported-by: Michael Cox <mhcox@bluezoosoftware.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2010, 15:25:31 UTC |
0d12e59 | Stephen Boyd | 18 March 2010, 05:10:45 UTC | pull: replace unnecessary sed invocation Getting the shortened branch name is as easy as using the shell's parameter expansion. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2010, 14:25:02 UTC |
7d182f5 | Thomas Rast | 17 March 2010, 11:14:57 UTC | Documentation: receive.denyCurrentBranch defaults to 'refuse' acd2a45 (Refuse updating the current branch in a non-bare repository via push, 2009-02-11) changed the default to refuse such a push, but it forgot to update the docs. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2010, 18:07:06 UTC |
d23e757 | Ian Ward Comfort | 17 March 2010, 09:20:35 UTC | bash: complete *_HEAD refs if present We already complete HEAD, of course, and might as well complete the other common refs mentioned in the rev-parse man page: FETCH_HEAD, ORIG_HEAD, and MERGE_HEAD. Signed-off-by: Ian Ward Comfort <icomfort@stanford.edu> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2010, 18:03:44 UTC |
14cd458 | Gustaf Hendeby | 16 March 2010, 17:52:37 UTC | Improve error messages from 'git stash show' The previous error message "fatal: Needed a single revision" is not very informative. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2010, 02:23:24 UTC |
3aff874 | Brandon Casey | 15 March 2010, 22:10:06 UTC | daemon.c: avoid accessing ss_family member of struct sockaddr_storage When NO_SOCKADDR_STORAGE is set for a platform, either sockaddr_in or sockaddr_in6 is used intead. Neither of which has an ss_family member. They have an sin_family and sin6_family member respectively. Since the addrcmp() function accesses the ss_family member of a sockaddr_storage struct, compilation fails on platforms which define NO_SOCKADDR_STORAGE. Since any sockaddr_* structure can be cast to a struct sockaddr and have its sa_family member read, do so here to workaround this issue. Thanks to Martin Storsjö for pointing out the fix, and Gary Vaughan for drawing attention to the issue. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2010, 02:07:09 UTC |
e01de1c | Junio C Hamano | 16 March 2010, 05:12:55 UTC | refs: ref entry with NULL sha1 is can be a dangling symref Brandon Casey noticed that t5505 had accidentally broken its && chain, hiding inconsistency between the code that writes the warning to the standard output and the test that expects to see the warning on the standard error, which was introduced by f8948e2 (remote prune: warn dangling symrefs, 2009-02-08). It turns out that the issue is deeper than that. After f8948e2, a symref that is dangling is marked with a NULL sha1, and the idea of using NULL sha1 to mean a deleted ref was scrapped, but somehow a follow-up eafb452 (do_one_ref(): null_sha1 check is not about broken ref, 2009-07-22) incorrectly reorganized do_one_ref(), still thinking NULL sha1 is never used in the code. Fix this by: - adopt Brandon's fix to t5505 test; - introduce REF_BROKEN flag to mark a ref that fails to resolve (dangling symref); - move the check for broken ref back inside the "if we are skipping dangling refs" code block. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2010, 06:37:42 UTC |