| d599e04 | Junio C Hamano | 24 April 2010, 01:27:17 UTC | Git 1.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2010, 01:27:17 UTC |
| 34c071a | Junio C Hamano | 24 April 2010, 01:24:32 UTC | Merge branch 'maint' * maint: Documentation improvements for the description of short format. | 24 April 2010, 01:24:32 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 |
| 08641d0 | Junio C Hamano | 23 April 2010, 06:05:49 UTC | Sync with 1.7.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2010, 06:05:49 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 |
| 3e7f1e6 | Junio C Hamano | 22 April 2010, 06:54:04 UTC | Merge branch 'maint' * maint: Documentation/Makefile: fix interrupted builds of user-manual.xml | 22 April 2010, 06:54:04 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 |
| ddd02b7 | Junio C Hamano | 20 April 2010, 05:41:30 UTC | Merge branch 'maint' * maint: t7012: Mark missing tests as TODO reflog: remove 'show' from 'expire's usage string MSVC: Fix build by adding missing termios.h dummy | 20 April 2010, 05:41:30 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 |
| 5469e2d | Junio C Hamano | 19 April 2010, 05:19:04 UTC | Git 1.7.1-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2010, 05:19:04 UTC |
| 407a963 | Junio C Hamano | 19 April 2010, 04:32:25 UTC | Merge branch 'rr/remote-helper-doc' * rr/remote-helper-doc: Documentation/remote-helpers: Fix typos and improve language Fixup: Second argument may be any arbitrary string Documentation/remote-helpers: Add invocation section Documentation/urls: Rewrite to accomodate <transport>::<address> Documentation/remote-helpers: Rewrite description | 19 April 2010, 04:32:25 UTC |
| c4df50c | Junio C Hamano | 19 April 2010, 04:32:21 UTC | Merge branch 'wp/doc-filter-direction' * wp/doc-filter-direction: documentation: clarify direction of core.autocrlf | 19 April 2010, 04:32:21 UTC |
| bc32d34 | Junio C Hamano | 19 April 2010, 04:31:50 UTC | Merge branch 'jk/maint-diffstat-overflow' * jk/maint-diffstat-overflow: diff: use large integers for diffstat calculations | 19 April 2010, 04:31:50 UTC |
| 779f946 | Junio C Hamano | 19 April 2010, 04:31:29 UTC | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format' * jg/auto-initialize-notes-with-percent-n-in-format: t3301: add tests to use --format="%N" pretty: Initialize notes if %N is used | 19 April 2010, 04:31:29 UTC |
| fab4502 | Junio C Hamano | 19 April 2010, 04:31:20 UTC | Merge branch 'maint' * maint: Documentation: Describe other situations where -z affects git diff | 19 April 2010, 04:31:20 UTC |
| e8a1228 | Junio C Hamano | 19 April 2010, 01:36:41 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Display dirty submodules correctly gitk: Fix display of copyright symbol gitk: Add emacs editor variable block gitk: Avoid calling tk_setPalette on Windows gitk: Don't clobber "Remember this view" setting gitk: Add comments to explain encode_view_opts and decode_view_opts gitk: Use consistent font for all text input fields gitk: Set the font for all listbox widgets gitk: Set the font for all spinbox widgets gitk: Remove forced use of sans-serif font gitk: Add Ctrl-W shortcut for closing the active window | 19 April 2010, 01:36:41 UTC |
| d43427d | Ramkumar Ramachandra | 18 April 2010, 00:57:37 UTC | Documentation/remote-helpers: Fix typos and improve language Fix some typos and errors in grammar and tense. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:29 UTC |
| 272a36b | Ramkumar Ramachandra | 18 April 2010, 00:56:37 UTC | Fixup: Second argument may be any arbitrary string This is intended to be a fixup for commit ad466d1 in pu. As Jonathan Neider pointed out, the second argument may be any arbitrary string, and need not conform to any URL-like shape. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:24 UTC |
| b6c8d2d | Ramkumar Ramachandra | 07 April 2010, 05:44:41 UTC | Documentation/remote-helpers: Add invocation section Add an 'Invocation' section to specify what the command line arguments mean. Also include a link to git-remote in the 'See Also' section. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:17 UTC |
| 5ce4f4e | Ramkumar Ramachandra | 06 April 2010, 08:38:19 UTC | Documentation/urls: Rewrite to accomodate <transport>::<address> Rewrite the first part of the document to explicitly show differences between the URLs that can be used with different transport protocols. Mention <transport>::<address> format to explicitly invoke a remote helper. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:05 UTC |
| 00b84e9 | Ramkumar Ramachandra | 28 March 2010, 18:03:50 UTC | Documentation/remote-helpers: Rewrite description Rewrite the description section to describe what exactly remote helpers are and the need for them. Also mention the curl family of remote helpers as an example. [jc: with readability fixes from Jonathan squashed in] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:55:41 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 |
| 77bc694 | Jeff King | 18 April 2010, 12:01:45 UTC | rebase-interactive: silence warning when no commits rewritten If you do a "rebase -i" and don't change any commits, nothing is rewritten, and we have no REWRITTEN_LIST. The shell prints out an ugly message: $ GIT_EDITOR=true git rebase -i HEAD^ /path/to/git-rebase--interactive: 1: cannot open /path/to/repo/.git/rebase-merge/rewritten-list: No such file Successfully rebased and updated refs/heads/master. We can fix it by not running "notes copy" at all if nothing was rewritten. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 18:41:53 UTC |
| 636db2c | Junio C Hamano | 18 April 2010, 18:19:39 UTC | t3301: add tests to use --format="%N" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 18:19:39 UTC |
| f3bd6ab | Junio C Hamano | 17 April 2010, 19:40:45 UTC | Merge branch 'maint' * maint: t1010-mktree: Adjust expected result to code and documentation combined diff: correctly handle truncated file Document new "already-merged" rule for branch -d | 17 April 2010, 19:40:45 UTC |
| f02dd06 | Matthew Ogilvie | 17 April 2010, 02:29:18 UTC | t6006: do not write to /tmp Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 19:40:20 UTC |
| 3940730 | Chris Webb | 15 April 2010, 13:29:45 UTC | git-instaweb: pass through invoking user's path to gitweb CGI scripts When used with lighttpd or mongoose, git-instaweb previously passed a hard-coded, default value of PATH to the gitweb CGI script. Use the invoking user's value for PATH for this instead. (This is already implicitly the behaviour for other web servers supported by git-instaweb.) Signed-off-by: Chris Webb <chris@arachsys.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 17 April 2010, 19:40:20 UTC |
| 8de096b | Junio C Hamano | 15 April 2010, 12:57:18 UTC | gitweb: simplify gitweb.min.* generation and clean-up rules GITWEB_CSS and GITWEB_JS are meant to be "what URI should the installed cgi script use to refer to the stylesheet and JavaScript", never "this is the name of the file we are building". Don't use them to decide what file to build minified versions in. While we are at it, lose FILES that is used only for "clean" target in a misguided way. "make clean" should try to remove all the potential build artifacts regardless of a minor configuration change. Instead of trying to remove only the build product "make clean" would have created if it were run without "clean", explicitly list the three potential build products for removal. Tested-by: Mark Rada <marada@uwaterloo.co> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 19:40:19 UTC |
| a6ccbbd | Jonathan Nieder | 15 April 2010, 09:36:25 UTC | tag -v: use RUN_GIT_CMD to run verify-tag This is the preferred way to run a git command. The only obvious observable effects I can think of are that the exec is properly reported in GIT_TRACE output and that verifying signed tags will still work if the git-verify-tag hard link in gitexecdir goes missing. Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 19:40:19 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 |
| a1d383c | Jens Lehmann | 09 April 2010, 20:16:42 UTC | gitk: Display dirty submodules correctly Since recently "git diff --submodule" prints out extra lines when the submodule contains untracked or modified files. Show all those lines of one submodule under the same header. Also for newly added or removed submodules the submodule name contained trailing garbage because the extraction of the name was not done right. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 17 April 2010, 08:53:24 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 |
| 3e8c0eb | Jonathan Nieder | 15 April 2010, 07:35:20 UTC | Add .depend directories to .gitignore The makefile snippets that would land in these directories are already being ignored. Ignore the directories instead so they don’t show up in ‘git clean -n’ output. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2010, 07:53:08 UTC |
| a6018bb | Junio C Hamano | 14 April 2010, 01:21:29 UTC | Merge branch 'maint' * maint: Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 Docs: Add -X option to git-merge's synopsis. Conflicts: Documentation/merge-options.txt | 14 April 2010, 01:21:29 UTC |
| 5b16360 | Johannes Gilger | 13 April 2010, 20:31:12 UTC | pretty: Initialize notes if %N is used When using git log --pretty='%N' without an explicit --show-notes, git would segfault. This patches fixes this behaviour by loading the needed notes datastructures if --pretty is used and the format contains %N. When --pretty='%N' is used together with --no-notes, %N won't be expanded. This is an extension to a proposed patch by Jeff King. Signed-off-by: Johannes Gilger <heipei@hackvalue.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2010, 01:15:08 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 |
| 4553d58 | Junio C Hamano | 11 April 2010, 20:54:28 UTC | Merge branch 'jl/maint-submodule-gitfile-awareness' * jl/maint-submodule-gitfile-awareness: Windows: start_command: Support non-NULL dir in struct child_process | 11 April 2010, 20:54:28 UTC |
| f9a2743 | Johannes Sixt | 11 April 2010, 20:40:12 UTC | Windows: start_command: Support non-NULL dir in struct child_process A caller of start_command can set the member 'dir' to a directory to request that the child process starts with that directory as CWD. The first user of this feature was added recently in eee49b6 (Teach diff --submodule and status to handle .git files in submodules). On Windows, we have been lazy and had not implemented support for this feature, yet. This fixes the shortcoming. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 20:48:46 UTC |
| 7b575f3 | Junio C Hamano | 11 April 2010, 20:44:17 UTC | Sync with 1.7.0.5 | 11 April 2010, 20:46:08 UTC |
| fb10369 | Junio C Hamano | 11 April 2010, 20:44:05 UTC | Merge branch 'jc/doc-submit-gmail' * jc/doc-submit-gmail: SubmittingPatches: update GMail section | 11 April 2010, 20:44:05 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 |
| fe90c93 | Stephen Boyd | 11 April 2010, 08:43:46 UTC | t3507: Make test executable Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 19:13:13 UTC |
| b9aa901 | Junio C Hamano | 10 April 2010, 20:05:16 UTC | Git 1.7.1-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2010, 20:05:16 UTC |
| b92cbb6 | Junio C Hamano | 10 April 2010, 20:02:22 UTC | Merge branch 'mr/gitweb-jsmin' * mr/gitweb-jsmin: gitweb: update INSTALL to use shorter make target gitweb: add documentation to INSTALL regarding gitweb.js instaweb: add minification awareness Gitweb: add autoconfigure support for minifiers Gitweb: add support for minifying gitweb.css Gitweb: add ignore and clean rules for minified files | 10 April 2010, 20:02:22 UTC |
| 055e1e2 | Junio C Hamano | 10 April 2010, 19:13:46 UTC | Merge branch 'jl/maint-submodule-gitfile-awareness' * jl/maint-submodule-gitfile-awareness: Teach diff --submodule and status to handle .git files in submodules | 10 April 2010, 19:13:46 UTC |
| eee49b6 | Jens Lehmann | 10 April 2010, 17:01:12 UTC | Teach diff --submodule and status to handle .git files in submodules The simple test for an existing .git directory gives an incorrect result if .git is a file that records "gitdir: overthere". So for submodules that use a .git file, "git status" and the diff family - when the "--submodule" option is given - did assume the submodule was not populated at all when a .git file was used, thus generating wrong output or no output at all. This is fixed by using read_gitfile_gently() to get the correct location of the .git directory. While at it, is_submodule_modified() was cleaned up to use the "dir" member of "struct child_process" instead of setting the GIT_WORK_TREE and GIT_DIR environment variables. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2010, 18:51:56 UTC |
| 3b0c196 | Junio C Hamano | 10 April 2010, 05:43:18 UTC | Merge branch 'maint' * maint: Let check_preimage() use memset() to initialize "struct checkout" fetch/push: fix usage strings | 10 April 2010, 05:43:18 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 |
| da288e2 | Junio C Hamano | 10 April 2010, 03:42:10 UTC | Merge branch 'rc/maint-reflog-msg-for-forced-branch' * rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations Conflicts: builtin-branch.c | 10 April 2010, 03:42: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 |
| 7ec1eb9 | Junio C Hamano | 09 April 2010, 06:31:27 UTC | Merge early parts of jk/cached-textconv | 09 April 2010, 06:31:51 UTC |
| aed6ca5 | Junio C Hamano | 09 April 2010, 06:30:49 UTC | diff.c: work around pointer constness warnings The textconv leak fix introduced two invocations of free() to release memory pointed by "const char *", which get annoying compiler warning. | 09 April 2010, 06:30:49 UTC |
| dcc30eb | Junio C Hamano | 09 April 2010, 06:27:23 UTC | Merge branch 'maint' * maint: docs: clarify "branch -l" | 09 April 2010, 06:27:23 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 |
| df5753c | Junio C Hamano | 07 April 2010, 22:59:17 UTC | SubmittingPatches: update GMail section Even if you use imap-send to throw your drafts in the outbox, using their web interface will mangle your patches. Clarify that the imap-send is meant to be used together with a real MUA that can use IMAP drafts, and remove instructions related to the web interface, which is irrelevant. Add description of send-email as an alternative. Use --cover-letter, and do not use -C nor --no-color, on the example command line for format-patch. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2010, 23:04:09 UTC |
| 02125bc | Junio C Hamano | 07 April 2010, 22:34:09 UTC | Merge branch 'mg/notes-reflog' * mg/notes-reflog: refs.c: Write reflogs for notes just like for branch heads t3301-notes: Test the creation of reflog entries | 07 April 2010, 22:34:09 UTC |
| d6b5af6 | Junio C Hamano | 07 April 2010, 22:34:06 UTC | Merge branch 'jn/mailinfo-scissors' * jn/mailinfo-scissors: Teach mailinfo %< as an alternative scissors mark | 07 April 2010, 22:34:06 UTC |
| e3af3cf | Jeff King | 07 April 2010, 20:57:11 UTC | fix typos and grammar in 1.7.1 draft release notes Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2010, 21:32:51 UTC |
| a751b5c | Brandon Casey | 06 April 2010, 15:11:44 UTC | notes.h: declare bit field as unsigned to silence compiler complaints The IRIX MIPSPro compiler complains like this: cc-1107 c99: WARNING File = notes.h, Line = 215 A signed bit field has a length of 1 bit. int suppress_default_notes:1; ^ 'unsigned' is what was intended, so lets make it so. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2010, 04:55:50 UTC |
| 537f6c7 | Junio C Hamano | 06 April 2010, 22:00:01 UTC | Git 1.7.1-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2010, 22:00:01 UTC |
| b807c52 | Junio C Hamano | 06 April 2010, 21:50:47 UTC | Merge branch 'da/maint-python-startup' * da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method | 06 April 2010, 21:50:47 UTC |
| 4a8295f | Junio C Hamano | 06 April 2010, 21:50:47 UTC | Merge branch 'ic/bash-completion-rpm' * ic/bash-completion-rpm: RPM spec: include bash completion support | 06 April 2010, 21:50:47 UTC |
| ae722b4 | Junio C Hamano | 06 April 2010, 21:50:46 UTC | Merge branch 'sb/fmt-merge-msg' * sb/fmt-merge-msg: fmt-merge-msg: hide summary option fmt-merge-msg: remove custom string_list implementation string-list: add unsorted_string_list_lookup() fmt-merge-msg: use pretty.c routines t6200: test fmt-merge-msg more t6200: modernize with test_tick fmt-merge-msg: be quiet if nothing to merge | 06 April 2010, 21:50:46 UTC |
| 3f3f8d9 | Junio C Hamano | 06 April 2010, 21:50:46 UTC | Merge branch 'jc/conflict-marker-size' * jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute | 06 April 2010, 21:50:46 UTC |
| f9bdf9b | Junio C Hamano | 06 April 2010, 21:50:46 UTC | Merge branch 'ef/maint-empty-commit-log' * ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message | 06 April 2010, 21:50:46 UTC |
| 15bf052 | Junio C Hamano | 06 April 2010, 21:50:45 UTC | Merge branch 'sg/bash-completion' * sg/bash-completion: bash: completion for gitk aliases bash: support user-supplied completion scripts for aliases bash: support user-supplied completion scripts for user's git commands bash: improve aliased command recognition | 06 April 2010, 21:50:45 UTC |
| 8b5fe8c | Junio C Hamano | 05 April 2010, 17:16:11 UTC | Revert "Link against libiconv on IRIX" Brandon Casey reports: Subject: Re: [PATCH] Link against libiconv on IRIX Date: Mon, 05 Apr 2010 11:45:32 -0500 Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil> This breaks compilation on IRIX 6.5.29m for me since there is no separate libiconv.so. What version of IRIX are you using? On my system, even the iconv utility doesn't link against a libiconv shared object. It seems the iconv functionality is in libc. # ldd /usr/bin/iconv libc.so.1 => /usr/lib32/libc.so.1 Could it be that you are using a third party iconv library? I've experienced this on another system and the problem was related to curl. In that case, curl was linked against an external iconv and not the native library, so if I tried to build with curl support, I had to also build against the external iconv library. While we wait for an improved solution, revert the regression caused by 21704227904b51197976c61c595b52d807677533. | 05 April 2010, 17:16:11 UTC |
| 11766ca | Junio C Hamano | 04 April 2010, 17:23:21 UTC | Merge branch 'maint' * maint: pack-protocol.txt: fix pkt-line lengths pack-protocol.txt: fix spelling | 04 April 2010, 17:23:21 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 |
| 9974e29 | Jonathan Nieder | 03 April 2010, 19:52:17 UTC | Teach mailinfo %< as an alternative scissors mark Handle perforations found “in the wild” more robustly by recognizing “%<” as an alternative scissors mark. This feature is only meant to support old habits. Discourage new use of the percent-based version by only documenting the 8< symbol so new users’ perforations can still be recognized by old versions of Git. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2010, 17:17:55 UTC |
| 9234b00 | Junio C Hamano | 03 April 2010, 19:28:44 UTC | Merge branch 'mb/rebase-i-no-ff' * mb/rebase-i-no-ff: Teach rebase the --no-ff option. Conflicts: git-rebase--interactive.sh t/t3404-rebase-interactive.sh | 03 April 2010, 19:28:44 UTC |
| 7b1cb5c | Junio C Hamano | 03 April 2010, 19:28:43 UTC | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' * sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die() | 03 April 2010, 19:28:43 UTC |
| 9b5a7c4 | Junio C Hamano | 03 April 2010, 19:28:42 UTC | Merge branch 'rr/imap-send-unconfuse-from-line' * rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body | 03 April 2010, 19:28:42 UTC |
| aa4beff | Junio C Hamano | 03 April 2010, 19:28:42 UTC | Merge branch 'mg/use-default-abbrev-length-in-rev-list' * mg/use-default-abbrev-length-in-rev-list: rev-list: use default abbrev length when abbrev-commit is in effect | 03 April 2010, 19:28:42 UTC |
| aa8b125 | Junio C Hamano | 03 April 2010, 19:28:42 UTC | Merge branch 'mg/maint-send-email-lazy-editor' * mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable | 03 April 2010, 19:28:42 UTC |
| 4de113c | Junio C Hamano | 03 April 2010, 19:28:41 UTC | Merge branch 'rb/maint-python-path' * rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD | 03 April 2010, 19:28:41 UTC |
