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 |
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 |
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 |
7325283 | Michael J Gruber | 15 March 2010, 10:54:46 UTC | Documentation/git-read-tree: clarify 2-tree merge Clarify the description of the 2-tree merge by defining the terms which are used in the table, and by applying some small linguistic changes. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2010, 22:25:17 UTC |
71928f7 | Michael J Gruber | 15 March 2010, 10:54:45 UTC | Documentation/git-read-tree: fix table layout Asciidoc takes the first non-space character in the first line of the paragraph as a reference point for preformatted layout, so adjust to that to make the table align. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2010, 22:20:03 UTC |
b75aea8 | Junio C Hamano | 01 March 2010, 03:12:31 UTC | tests for "git add ignored-dir/file" without -f Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2010, 07:23:22 UTC |
29209cb | Jeff King | 11 March 2010, 07:15:43 UTC | dir: fix COLLECT_IGNORED on excluded prefixes As we walk the directory tree, if we see an ignored path, we want to add it to the ignored list only if it matches any pathspec that we were given. We used to check for the pathspec to appear explicitly. E.g., if we see "subdir/file" and it is excluded, we check to see if we have "subdir/file" in our pathspec. However, this interacts badly with the optimization to avoid recursing into ignored subdirectories. If "subdir" as a whole is ignored, then we never recurse, and consider only whether "subdir" itself is in our pathspec. It would not match a pathspec of "subdir/file" explicitly, even though it is the reason that subdir/file would be excluded. This manifests itself to the user as "git add subdir/file" failing to correctly note that the pathspec was ignored. This patch extends the in_pathspec logic to include prefix directory case. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2010, 07:23:08 UTC |
0d7c243 | Junio C Hamano | 01 March 2010, 07:31:21 UTC | t0050: mark non-working test as such The test is to prepare an empty file "camelcase" in the index, remove and replace it with another file "CamelCase" with "1" as its contents in the working tree, and add it to the index, in a repository configured to be case insensitive. However, the test actually checked ls-files knows about a pathname that matches "camelcase" case insensitively. It didn't check if the added contents actually was the updated one. Mark the test as non-working. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2010, 07:22:50 UTC |
8fcaca3 | Dave Olszewski | 13 March 2010, 22:47:05 UTC | don't use default revision if a rev was specified If a revision is specified, it happens not to have any commits, don't use the default revision. By doing so, surprising and undesired behavior can happen, such as showing the reflog for HEAD when a branch was specified. [jc: squashed a test from René] Signed-off-by: Dave Olszewski <cxreg@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2010, 05:23:43 UTC |
8ca7880 | René Scharfe | 13 March 2010, 17:37:50 UTC | for_each_recent_reflog_ent(): use strbuf, fix offset handling As Vladimir reported, "git log -g refs/stash" surprisingly showed the reflog of HEAD if the message in the reflog file was too long. To fix this, convert for_each_recent_reflog_ent() to use strbuf_getwholeline() instead of fgets(), for safety and to avoid any size limits for reflog entries. Also reverse the logic of the part of the function that only looks at file tails. It used to close the file if fgets() succeeded. The following fgets() call in the while loop was likely to fail in this case, too, so passing an offset to for_each_recent_reflog_ent() never worked. Change it to error out if strbuf_getwholeline() fails instead. Reported-by: Vladimir Panteleev <vladimir@thecybershadow.net> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2010, 21:18:09 UTC |
34b383e | Junio C Hamano | 13 March 2010, 20:41:20 UTC | t/Makefile: remove test artifacts upon "make clean" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2010, 20:41:20 UTC |
00fb3d2 | René Scharfe | 13 March 2010, 10:25:12 UTC | blame: fix indent of line numbers Correct the calculation of the number of digits for line counts of the form 10^n-1 (9, 99, ...) in lineno_width(). This makes blame stop printing an extra space before the line numbers of files with that many total lines. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2010, 20:04:17 UTC |
4a2284b | Junio C Hamano | 12 March 2010, 05:40:33 UTC | t9400: Use test_cmp when appropriate Consistently using test_cmp would make debugging test scripts far easier, as output from them run under "-v" option becomes readable. Besides, some platforms' "diff" implementations lack "-q" option. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2010, 05:40:33 UTC |
7ff8b79 | Junio C Hamano | 08 March 2010, 08:50:24 UTC | Merge accumulated fixes to prepare for 1.7.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2010, 08:50:37 UTC |
6eb3adf | Junio C Hamano | 08 March 2010, 08:36:02 UTC | Merge branch 'mw/maint-gcc-warns-unused-write' into maint * mw/maint-gcc-warns-unused-write: run-command.c: fix build warnings on Ubuntu | 08 March 2010, 08:36:02 UTC |
990169b | Junio C Hamano | 08 March 2010, 08:36:02 UTC | Merge branch 'fn/maint-mkdtemp-compat' into maint * fn/maint-mkdtemp-compat: Fix gitmkdtemp: correct test for mktemp() return value | 08 March 2010, 08:36:02 UTC |
bd08ecc | Junio C Hamano | 08 March 2010, 08:36:02 UTC | Merge branch 'gb/maint-submodule-env' into maint * gb/maint-submodule-env: is_submodule_modified(): clear environment properly submodules: ensure clean environment when operating in a submodule shell setup: clear_local_git_env() function rev-parse: --local-env-vars option Refactor list of of repo-local env vars | 08 March 2010, 08:36:02 UTC |
030bc0a | Junio C Hamano | 08 March 2010, 08:36:01 UTC | Merge branch 'as/maint-expire' into maint * as/maint-expire: reflog: honor gc.reflogexpire=never prune: honor --expire=never | 08 March 2010, 08:36:01 UTC |
193c7aa | Junio C Hamano | 08 March 2010, 08:36:01 UTC | Merge branch 'ml/maint-grep-doc' into maint * ml/maint-grep-doc: grep docs: document --no-index option grep docs: --cached and <tree>... are incompatible grep docs: use AsciiDoc literals consistently grep docs: pluralize "Example" section | 08 March 2010, 08:36:01 UTC |
57c118c | Junio C Hamano | 08 March 2010, 08:36:01 UTC | Merge branch 'jk/maint-push-tracking-wo-remote' into maint * jk/maint-push-tracking-wo-remote: push: fix segfault for odd config | 08 March 2010, 08:36:01 UTC |
2dd96ea | Junio C Hamano | 08 March 2010, 08:36:00 UTC | Merge branch 'jc/fetch-param' into maint * jc/fetch-param: fetch --all/--multiple: keep all the fetched branch information builtin-fetch --all/--multi: propagate options correctly t5521: fix and modernize | 08 March 2010, 08:36:00 UTC |
162b464 | Junio C Hamano | 08 March 2010, 08:36:00 UTC | Merge branch 'ne/pack-local-doc' into maint * ne/pack-local-doc: pack-objects documentation: Fix --honor-pack-keep as well. pack-objects documentation: reword "objects that appear in the standard input" Documentation: pack-objects: Clarify --local's semantics. | 08 March 2010, 08:36:00 UTC |
9194513 | Junio C Hamano | 08 March 2010, 08:36:00 UTC | Merge branch 'jk/maint-add--interactive-delete' into maint * jk/maint-add--interactive-delete: add-interactive: fix bogus diff header line ordering | 08 March 2010, 08:36:00 UTC |
493e433 | Junio C Hamano | 08 March 2010, 08:36:00 UTC | Merge branch 'mm/mkstemps-mode-for-packfiles' into maint * mm/mkstemps-mode-for-packfiles: Use git_mkstemp_mode instead of plain mkstemp to create object files git_mkstemps_mode: don't set errno to EINVAL on exit. Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. Move gitmkstemps to path.c Add a testcase for ACL with restrictive umask. | 08 March 2010, 08:36:00 UTC |
6ae611f | Junio C Hamano | 08 March 2010, 08:35:59 UTC | Merge branch 'jc/maint-fix-mailinfo-strip' into maint * jc/maint-fix-mailinfo-strip: mailinfo: do not strip leading spaces even for a header line | 08 March 2010, 08:35:59 UTC |
1f54d69 | Junio C Hamano | 08 March 2010, 08:35:59 UTC | Merge branch 'jc/grep-author-all-match-implicit' into maint * jc/grep-author-all-match-implicit: "log --author=me --grep=it" should find intersection, not union | 08 March 2010, 08:35:59 UTC |
89cd4aa | Junio C Hamano | 08 March 2010, 08:35:59 UTC | Merge branch 'jc/checkout-detached' into maint * jc/checkout-detached: Reword "detached HEAD" notification | 08 March 2010, 08:35:59 UTC |
4ac23f3 | Junio C Hamano | 08 March 2010, 08:35:58 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: | 08 March 2010, 08:35:58 UTC |
c214f2c | Junio C Hamano | 07 March 2010, 22:54:05 UTC | Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6 * jc/maint-fix-test-perm: lib-patch-mode.sh: Fix permission t6000lib: Fix permission | 07 March 2010, 22:54:05 UTC |
8499da0 | Junio C Hamano | 07 March 2010, 22:54:01 UTC | Merge branch 'sp/maint-push-sideband' into maint-1.6.6 * sp/maint-push-sideband: receive-pack: Send internal errors over side-band #2 t5401: Use a bare repository for the remote peer receive-pack: Send hook output over side band #2 receive-pack: Wrap status reports inside side-band-64k receive-pack: Refactor how capabilities are shown to the client send-pack: demultiplex a sideband stream with status data run-command: support custom fd-set in async run-command: Allow stderr to be a caller supplied pipe | 07 March 2010, 22:54:01 UTC |
47b333f | Junio C Hamano | 07 March 2010, 22:53:57 UTC | Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6 * hm/maint-imap-send-crlf: git-imap-send: Convert LF to CRLF before storing patch to draft box | 07 March 2010, 22:53:57 UTC |
b7380fa | Junio C Hamano | 07 March 2010, 22:53:53 UTC | Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6 * gf/maint-sh-setup-nongit-ok: require_work_tree broken with NONGIT_OK | 07 March 2010, 22:53:53 UTC |
cb16bcc | Junio C Hamano | 07 March 2010, 22:53:50 UTC | Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6 * jk/maint-rmdir-fix: rm: fix bug in recursive subdirectory removal | 07 March 2010, 22:53:50 UTC |
11a1a49 | Junio C Hamano | 07 March 2010, 22:53:45 UTC | Merge branch 'rs/optim-text-wrap' into maint-1.6.6 * rs/optim-text-wrap: utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() utf8.c: remove strbuf_write() utf8.c: remove print_spaces() utf8.c: remove print_wrapped_text() | 07 March 2010, 22:53:45 UTC |
7b576f9 | Junio C Hamano | 07 March 2010, 22:53:40 UTC | Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6 * tr/maint-cherry-pick-list: cherry_pick_list: quit early if one side is empty | 07 March 2010, 22:53:40 UTC |
7f43e75 | Junio C Hamano | 07 March 2010, 22:53:35 UTC | Merge branch 'cc/maint-bisect-paths' into maint-1.6.6 * cc/maint-bisect-paths: bisect: error out when passing bad path parameters | 07 March 2010, 22:53:35 UTC |
8b12413 | Junio C Hamano | 28 February 2010, 02:56:38 UTC | color: allow multiple attributes In configuration files (and "git config --color" command line), we supported one and only one attribute after foreground and background color. Accept combinations of attributes, e.g. [diff.color] old = red reverse bold Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2010, 20:00:36 UTC |
97222d9 | Junio C Hamano | 07 March 2010, 19:07:51 UTC | Git 1.7.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2010, 19:07:51 UTC |
5565f47 | Bert Wesarg | 18 November 2009, 16:15:19 UTC | unset GREP_OPTIONS in test-lib.sh I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this the test t4252-am-options.sh fails because it calls grep with a .rej file: grep "@@ -1,3 +1,3 @@" file-2.rej Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2010, 19:05:18 UTC |