| a6dbf88 | Junio C Hamano | 13 September 2009, 20:38:48 UTC | pull: Clarify "helpful" message for another corner case When the remote branch we asked for merging did not exist in the set of fetched refs, we unconditionally hinted that it was because of lack of configuration. It is not necessarily so, and risks sending users for a wild goose chase. Make sure to check if that is indeed the case before telling a wild guess to the user. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2009, 05:26:27 UTC |
| 3ddcb19 | Thiago Farina | 22 September 2009, 23:48:06 UTC | Update "describe" documentation to match reality A sample "git describe -h" did not match what the program actually says. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2009, 02:40:05 UTC |
| 9f040e9 | SZEDER Gábor | 15 September 2009, 10:21:45 UTC | bash: teach 'git reset --patch' Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:47:27 UTC |
| 59d5eee | SZEDER Gábor | 15 September 2009, 10:21:44 UTC | bash: update 'git stash' completion This update adds 'git stash (apply|pop) --quiet' and all options known to 'git stash save', and handles the DWIMery from 3c2eb80f (stash: simplify defaulting to "save" and reject unknown options, 2009-08-18). Care is taken to avoid offering subcommands in the DWIM case. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:47:26 UTC |
| 918c03c | SZEDER Gábor | 15 September 2009, 10:21:43 UTC | bash: rename __git_find_subcommand() to __git_find_on_cmdline() __git_find_subcommand() was originally meant to check whether subcommands are already present on the command line. But the code is general enough to be used for checking the presence of command line options as well, and the next commit will use it for that purpose, so let's give it a more general name. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:47:26 UTC |
| 3696c4c | Junio C Hamano | 21 September 2009, 19:44:05 UTC | pay attention to DESTDIR when building with NO_PERL_MAKEMAKER Building with prefix=/some/where and temporarily installing it to elsewhere for tar'ing up is done with: make prefix=/some/where make prefix=/some/where DESTDIR=/else/where install Make handcrafted perl/perl.mak without NO_PERL_MAKEMAKER honour DESTDIR. Ancient ExtUtils::MakeMaker (pre 6.11?) has the same issue, but recent versions of Perl ships with at leat 6.17; this patch does not address that issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:20:40 UTC |
| f1e3156 | Jim Meyering | 21 September 2009, 11:00:34 UTC | pre-commit.sample: add comment re tr portability; fix grammar Add a comment explaining why square brackets around a tr range are not only ok, but actually required in this case. Correct spelling and grammar. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:15:42 UTC |
| 6426ee6 | Junio C Hamano | 22 September 2009, 01:14:12 UTC | Update Release Notes to 1.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 01:14:12 UTC |
| a16753d | Johannes Sixt | 21 September 2009, 07:34:58 UTC | test-genrandom: ensure stdout is set to _O_BINARY on Windows Commit a6ca8c62 (Set _O_BINARY as default fmode for both MinGW and MSVC) removed the definition of _CRT_fmode from mingw.c. Before this commit, since test-genrandom is linked against libgit.a, the MinGW process initialization code would pick up that definition of _CRT_fmode, which was initialized to _O_BINARY. After this commit, however, text mode is used for std(in|out|err) because it is the default in absence of _CRT_fmode. In order to fix that, we must use git-compat-util.h, which overrides main() to set the mode to binary. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2009, 07:36:12 UTC |
| 0984e3a | Junio C Hamano | 21 September 2009, 06:47:52 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Work around leftover temporary save file gitk: Show diff of commits at end of compare-commits output gitk: Update Swedish translation (280t0f0u) | 21 September 2009, 06:47:52 UTC |
| 9bedb0e | Pat Thoyts | 15 September 2009, 09:26:30 UTC | gitk: Work around leftover temporary save file If a file exists and is hidden on Windows the Tcl open command will fail as the attributes provided in the CREAT call fail to match those of the existing file. Forcing removal of the temporary file before we begin solves any problems caused by previous failures to save the application settings. An alternative would be to remove the hidden attribute before calling 'open'. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 September 2009, 03:04:48 UTC |
| 6e4ece6 | Junio C Hamano | 20 September 2009, 19:13:47 UTC | Merge branch 'maint' * maint: push: Correctly initialize nonfastforward in transport_push. | 20 September 2009, 19:13:47 UTC |
| bb8cccd | Matthieu Moy | 20 September 2009, 17:33:20 UTC | push: Correctly initialize nonfastforward in transport_push. The variable is assigned unconditionally in print_push_status, but print_push_status is not reached by all codepaths. In particular, this fixes a bug where "git push ... nonexisting-branch" was complaining about non-fast forward. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2009, 19:11:29 UTC |
| f5c3178 | Marius Storm-Olsen | 16 September 2009, 08:20:31 UTC | Tag GIT_VERSION when Git is built with MSVC This may help us debug issues on Windows, as we now can build Git natively on Windows with both MinGW and MSVC. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 259d87c | Marius Storm-Olsen | 16 September 2009, 08:20:30 UTC | Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake) These scripts generate projects for the MSVC IDE (.vcproj files) or QMake (.pro files), based on the output of a 'make -n MSVC=1 V=1' run. This enables us to simply do the necesarry changes in the Makefile, and you can update the other buildsystems by regenerating the files. Keeping the other buildsystems up-to-date with main development. The generator system is designed to easily drop in pm's for other buildsystems as well, if someone has an itch. However, the focus has been Windows development, so the 'engine' might need patches to support any platform. Also add some .gitignore entries for MSVC files. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| a2c6bf0 | Marius Storm-Olsen | 16 September 2009, 08:20:29 UTC | Add README for MSVC build Based on original README patch from Frank Li, describe the steps to build git with VS2008 (aka MSVC). Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 164a5e3 | Marius Storm-Olsen | 16 September 2009, 08:20:28 UTC | Add MSVC to Makefile Enable MSVC builds with GNU Make by simply calling make MSVC=1 (Debug build possible by adding DEBUG=1 as well) Two scripts, clink.pl and lib.pl, are used to convert certain GCC specific command line options into something MSVC understands. By building for MSVC with GNU Make, we can ensure that the MSVC port always follows the latest code, and does not lag behind due to unmaintained NMake Makefile or IDE projects. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 386ac45 | Marius Storm-Olsen | 16 September 2009, 08:20:27 UTC | Define strncasecmp and ftruncate for MSVC Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 435bdf8 | Marius Storm-Olsen | 16 September 2009, 08:20:26 UTC | Make usage of windows.h lean and mean Centralize the include of windows.h in git-compat-util.h, turn on WIN32_LEAN_AND_MEAN to avoid including plenty of other header files which is not needed in Git. Also ensure we load winsock2.h first, so we don't load the older winsock definitions at a later stage, since they contain duplicate definitions. When moving windows.h into git-compat-util.h, we need to protect the definition of struct pollfd in mingw.h, since this file is used by both MinGW and MSVC, and the latter defines this struct in winsock2.h. We need to keep the windows.h include in compat/win32.h, since its shared by both MinGW and Cygwin, and we're not touching Cygwin in this commit. The include in git-compat-util.h is protected with an ifdef WIN32, which is not the case when compiling for Cygwin. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| d75f8e6 | Frank Li | 16 September 2009, 08:20:25 UTC | Add platform files for porting to MSVC Add msvc.c and msvc.h to build git under MSVC. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 16fe1e0 | Frank Li | 16 September 2009, 08:20:24 UTC | Add MinGW header files to build git with MSVC Added the header files dirent.h, unistd.h and utime.h Add alloca.h, which simply includes malloc.h, which defines alloca(). Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 55fcb06 | Marius Storm-Olsen | 16 September 2009, 08:20:23 UTC | Add empty header files for MSVC port MSVC lacks many of the header files included by git-compat-util.h; add blank header files for these instead of going ifdef crazy. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 71064e3 | Frank Li | 16 September 2009, 08:20:22 UTC | Test for WIN32 instead of __MINGW32_ The code which is conditional on MinGW32 is actually conditional on Windows. Use the WIN32 symbol, which is defined by the MINGW32 and MSVC environments, but not by Cygwin. Define SNPRINTF_SIZE_CORR=1 for MSVC too, as its vsnprintf function does not add NUL at the end of the buffer if the result fits the buffer size exactly. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| d7fa500 | Frank Li | 16 September 2009, 08:20:21 UTC | Fix __stdcall placement and function prototype MSVC requires __stdcall to be between the functions return value and the function name, and that the function pointer type is in the form of return_type (WINAPI *function_name)(arguments...) Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| a6ca8c6 | Marius Storm-Olsen | 16 September 2009, 08:20:20 UTC | Set _O_BINARY as default fmode for both MinGW and MSVC MinGW set the _CRT_fmode to set both the default fmode and _O_BINARY on stdin/stdout/stderr. Rather use the main() define in mingw.h to set this for both MinGW and MSVC. This will ensure that a MinGW and MSVC build will handle input and output identically. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 3f83bf3 | Frank Li | 16 September 2009, 08:20:19 UTC | Change regerror() declaration from K&R style to ANSI C (C89) The MSVC headers typedef errcode as int, and thus confused the compiler in the K&R style definition. ANSI style deconfuses it. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 627735f | Marius Storm-Olsen | 16 September 2009, 08:20:18 UTC | Add include guards to compat/win32.h Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 0d30ad7 | Frank Li | 16 September 2009, 08:20:17 UTC | Avoid declaration after statement MSVC does not understand this C99 style. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:41 UTC |
| 812bdbc | Thiago Farina | 18 September 2009, 19:11:52 UTC | pack-objects: remove SP at the end of usage string These spaces immediately before the end of lines are unnecessary. While at it, instead of using a single string literal with backslashes at end of each line, split the lines into individual string literals and tell the compiler to concatenate them. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 02:48:48 UTC |
| 1f986c4 | Thiago Farina | 17 September 2009, 17:20:53 UTC | Update the usage bundle string. "git bundle -h" gives a single long line that is hard to read. Rewrite it into a multi-line format similar to the one used by other commands, e.g "git stash -h". Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 02:47:15 UTC |
| e481b1d | Clemens Buchacher | 17 September 2009, 07:21:02 UTC | cvs: initialize empty password If we do not read a password from the command line, and there are no passwords stored in .cvspass, we have to initialize the password with just "A". This fixes a regression introduced by 3fb9d582 (Do not scramble password read from .cvspass). Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2009, 07:38:49 UTC |
| 8426f67 | Junio C Hamano | 16 September 2009, 22:04:21 UTC | Merge 1.6.4.4 in Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2009, 22:04:21 UTC |
| cb57220 | Junio C Hamano | 16 September 2009, 21:53:26 UTC | GIT 1.6.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2009, 21:53:26 UTC |
| af4f640 | Junio C Hamano | 16 September 2009, 21:45:18 UTC | Merge branch 'jc/maint-unpack-objects-strict' into maint * jc/maint-unpack-objects-strict: Fix "unpack-objects --strict" Conflicts: builtin-unpack-objects.c | 16 September 2009, 21:45:18 UTC |
| 6674d31 | Junio C Hamano | 16 September 2009, 21:27:08 UTC | Merge branch 'tf/diff-whitespace-incomplete-line' into maint * tf/diff-whitespace-incomplete-line: xutils: Fix xdl_recmatch() on incomplete lines xutils: Fix hashing an incomplete line with whitespaces at the end | 16 September 2009, 21:27:08 UTC |
| bd91890 | Junio C Hamano | 16 September 2009, 21:26:56 UTC | Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint * jk/maint-1.6.3-checkout-unborn: checkout: do not imply "-f" on unborn branches | 16 September 2009, 21:26:56 UTC |
| bba2875 | Junio C Hamano | 16 September 2009, 21:26:40 UTC | Merge branch 'jc/maint-checkout-index-to-prefix' into maint * jc/maint-checkout-index-to-prefix: check_path(): allow symlinked directories to checkout-index --prefix | 16 September 2009, 21:26:40 UTC |
| 2b621c1 | Junio C Hamano | 14 September 2009, 21:48:27 UTC | Merge branch 'maint' * maint: http.c: avoid freeing an uninitialized pointer | 14 September 2009, 21:48:27 UTC |
| 4197ce3 | Junio C Hamano | 14 September 2009, 21:48:20 UTC | Merge branch 'rc/maint-http-no-head-pack-check' into maint * rc/maint-http-no-head-pack-check: http.c: avoid freeing an uninitialized pointer | 14 September 2009, 21:48:20 UTC |
| b202514 | Junio C Hamano | 14 September 2009, 21:48:15 UTC | http.c: avoid freeing an uninitialized pointer An earlier 59b8d38 (http.c: remove verification of remote packs) left the variable "url" uninitialized; "goto cleanup" codepath can free it which is not very nice. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2009, 21:48:15 UTC |
| 20f3490 | Heiko Voigt | 14 September 2009, 08:49:01 UTC | web--browse: fix Mac OS X GUI detection for 10.6 Since OS X 10.6 the variable $SECURITYSESSIONID does not exist anymore, so lets look for the $TERM_PROGRAM variable as backup. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2009, 09:27:25 UTC |
| 39c448c | Heiko Voigt | 14 September 2009, 08:47:06 UTC | remove logical typo in documentation of sample update hook Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2009, 09:23:49 UTC |
| 03aa8ff | Nicolas Pitre | 14 September 2009, 06:41:16 UTC | Nicolas Pitre has a new email address Due to problems at cam.org, my nico@cam.org email address is no longer valid. From now on, nico@fluxnic.net should be used instead. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2009, 09:23:36 UTC |
| 0f4b377 | Dmitry Potapov | 13 September 2009, 20:17:01 UTC | git-archive: infer output format from filename when unspecified A command line $ git archive -o my-v2.0.zip v2.0 almost certainly wants the output in zip format, even though it does not specify any --format option. When --format is not given, but output filename is, try to infer what format is requested from the filename extension. Currently this code only knows about '.zip'. When the format is unspecified and the filename does not tell us, the output will be in 'tar' format as before. Of course, an explicit --format will not trigger this guesswork. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 20:54:39 UTC |
| 518ef8f | Todd Zullinger | 11 September 2009, 23:23:45 UTC | completion: Replace config --list with --get-regexp James Bardin noted that the completion spewed warnings when no git config file is present. This is likely a bug to be fixed in git config, but it's also good to simplify the completion code by using the --get-regexp option as Jeff King pointed out. Signed-off-by: Todd Zullinger <tmz@pobox.com> Trivially-acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 20:40:25 UTC |
| 05d3951 | Dmitry Potapov | 13 September 2009, 12:05:52 UTC | git-archive: add '-o' as a alias for '--output' The '-o' option is commonly used in many tools to specify the output file. Typing '--output' every time is a bit too long to be a practical alternative to redirecting output. But specifying the output name has the advantage of making possible to guess the desired output format by filename extension. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 20:23:40 UTC |
| 98df233 | Clemens Buchacher | 13 September 2009, 10:49:45 UTC | test local clone by copying Test the effect of an earlier change by f7835a2 (preserve mtime of local clone, 2009-09-12) to keep stale loose object files stale in the new repository when a local clone is made by copying files in .git/ directory. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 20:22:29 UTC |
| 65d15ed | Johannes Gilger | 13 September 2009, 13:35:05 UTC | git-clone doc: typofix Signed-off-by: Johannes Gilger <heipei@hackvalue.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 18:58:54 UTC |
| 9f67fee | Nelson Elhage | 13 September 2009, 16:56:45 UTC | git-push: Accept -n as a synonym for --dry-run. git-push is not currently using -n for anything else, and it seems unlikely we will want to use it to mean anything else in the future, so add it as an alias for convenience. Signed-off-by: Nelson Elhage <nelhage@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 18:29:18 UTC |
| 12efe45 | Junio C Hamano | 13 September 2009, 18:23:34 UTC | git-commit doc: remove duplicated --dry-run description 60c2993 (Documentation/git-commit.txt: describe --dry-run, 2009-08-15) wanted to update the documentation to say that "git status" is not the same as "git commit --dry-run" anymore, but it screwed up and also added the description of --dry-run that was already present. Noticed by Johannes Gilger. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 18:24:26 UTC |
| eaf1c94 | Junio C Hamano | 13 September 2009, 08:50:22 UTC | GIT 1.6.5-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:50:33 UTC |
| 5f2b1e6 | Jari Aalto | 13 September 2009, 06:43:10 UTC | Improve --patch option documentation in git-add Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:36:13 UTC |
| 4a452ed | Junio C Hamano | 13 September 2009, 08:33:29 UTC | Merge branch 'pk/fast-import-tars' * pk/fast-import-tars: import-tars: Allow per-tar author and commit message. | 13 September 2009, 08:33:29 UTC |
| d821c00 | Junio C Hamano | 13 September 2009, 08:33:26 UTC | Merge branch 'pk/fast-import-dirs' * pk/fast-import-dirs: Add script for importing bits-and-pieces to Git. | 13 September 2009, 08:33:26 UTC |
| 79cb645 | Junio C Hamano | 13 September 2009, 08:33:20 UTC | Merge branch 'jt/pushinsteadof' * jt/pushinsteadof: Add url.<base>.pushInsteadOf: URL rewriting for push only Wrap rewrite globals in a struct in preparation for adding another set | 13 September 2009, 08:33:20 UTC |
| dc1b0c0 | Junio C Hamano | 13 September 2009, 08:33:18 UTC | Merge branch 'jk/unwanted-advices' * jk/unwanted-advices: status: make "how to stage" messages optional push: make non-fast-forward help message configurable | 13 September 2009, 08:33:18 UTC |
| 8b54f63 | Junio C Hamano | 13 September 2009, 08:33:15 UTC | Merge branch 'jc/merge-saner-messages' * jc/merge-saner-messages: merge-recursive: give less scary messages when merge did not start | 13 September 2009, 08:33:15 UTC |
| 1cdd64e | Junio C Hamano | 13 September 2009, 02:40:27 UTC | quiltimport documentation: --dry-run and -n are synonyms Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:32:49 UTC |
| f7835a2 | Clemens Buchacher | 12 September 2009, 09:03:48 UTC | preserve mtime of local clone A local clone without hardlinks copies all objects, including dangling ones, to the new repository. Since the mtimes are renewed, those dangling objects cannot be pruned by "git gc --prune", even if they would have been old enough for pruning in the original repository. Instead, preserve mtime during copy. "git gc --prune" will then work in the clone just like it did in the original. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:32:26 UTC |
| 4169837 | Jim Meyering | 12 September 2009, 08:43:27 UTC | don't dereference NULL upon fdopen failure There were several unchecked use of fdopen(); replace them with xfdopen() that checks and dies. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:32:20 UTC |
| 3d91352 | Jim Meyering | 12 September 2009, 08:54:32 UTC | use write_str_in_full helper to avoid literal string lengths This is the same fix to use write_str_in_full() helper to write a constant string out without counting the length of it ourselves. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:32:04 UTC |
| cd03eeb | Junio C Hamano | 13 September 2009, 08:31:55 UTC | Merge branch 'db/vcs-helper' * db/vcs-helper: Makefile: remove remnant of separate http/https/ftp helpers Use a clearer style to issue commands to remote helpers Make the "traditionally-supported" URLs a special case Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible Makefile: do not link three copies of git-remote-* programs Makefile: git-http-fetch does not need expat http-fetch: Fix Makefile dependancies Add transport native helper executables to .gitignore git-http-fetch: not a builtin Use an external program to implement fetching with curl Add support for external programs for handling native fetches | 13 September 2009, 08:31:55 UTC |
| 2b7ca83 | Jim Meyering | 12 September 2009, 08:54:32 UTC | use write_str_in_full helper to avoid literal string lengths In 2d14d65 (Use a clearer style to issue commands to remote helpers, 2009-09-03) I happened to notice two changes like this: - write_in_full(helper->in, "list\n", 5); + + strbuf_addstr(&buf, "list\n"); + write_in_full(helper->in, buf.buf, buf.len); + strbuf_reset(&buf); IMHO, it would be better to define a new function, static inline ssize_t write_str_in_full(int fd, const char *str) { return write_in_full(fd, str, strlen(str)); } and then use it like this: - strbuf_addstr(&buf, "list\n"); - write_in_full(helper->in, buf.buf, buf.len); - strbuf_reset(&buf); + write_str_in_full(helper->in, "list\n"); Thus not requiring the added allocation, and still avoiding the maintenance risk of literal string lengths. These days, compilers are good enough that strlen("literal") imposes no run-time cost. Transformed via this: perl -pi -e \ 's/write_in_full\((.*?), (".*?"), \d+\)/write_str_in_full($1, $2)/'\ $(git grep -l 'write_in_full.*"') Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:31:10 UTC |
| 511a3fc | Matthieu Moy | 12 September 2009, 10:39:30 UTC | wrap git's main usage string. It's now similar wrapped the same way as in Documentation/git.txt, and fits in a 67 characters wide terminal. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:31:02 UTC |
| 5b590d7 | Junio C Hamano | 13 September 2009, 08:30:53 UTC | Merge branch 'maint' * maint: GIT 1.6.4.3 svn: properly escape arguments for authors-prog http.c: remove verification of remote packs grep: accept relative paths outside current working directory grep: fix exit status if external_grep() punts Conflicts: GIT-VERSION-GEN RelNotes | 13 September 2009, 08:30:53 UTC |
| 7fb6bcf | Junio C Hamano | 13 September 2009, 08:04:23 UTC | GIT 1.6.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:28:13 UTC |
| d3d7d47 | Mark Lodato | 13 September 2009, 00:33:23 UTC | svn: properly escape arguments for authors-prog Previously, the call to authors-prog was not properly escaped, so any special characters in the Subversion username, such as spaces and semi-colons, would be interpreted by the shell rather than being passed in as the first argument. Now all unsafe characters are escaped using "git rev-parse --sq-quote" [ew: switched from "\Q..\E" to "rev-parse --sq-quote"] Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2009, 08:28:07 UTC |
| 45c58ba | Junio C Hamano | 13 September 2009, 08:24:20 UTC | Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint * cb/maint-1.6.3-grep-relative-up: grep: accept relative paths outside current working directory grep: fix exit status if external_grep() punts Conflicts: t/t7002-grep.sh | 13 September 2009, 08:24:20 UTC |
| 85cdaa4 | Junio C Hamano | 12 September 2009, 05:35:30 UTC | Makefile: remove remnant of separate http/https/ftp helpers Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2009, 05:35:30 UTC |
| 0c3d3ac | Jeff King | 09 September 2009, 14:59:37 UTC | rebase: use plumbing to show dirty state Commit 4cfbe06 introduced the use of "git diff" to show dirty state in a format more familiar to users. However, it should have used the plumbing "git diff-files" instead. Not only is it good practice in general to use plumbing in scripts, but in this case we really don't want the automatic pager to kick in for an error message. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2009, 04:41:15 UTC |
| edf563f | Jeff King | 09 September 2009, 11:43:03 UTC | status: make "how to stage" messages optional These messages are nice for new users, but experienced git users know how to manipulate the index, and these messages waste a lot of screen real estate. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2009, 04:33:24 UTC |
| 7519443 | Jeff King | 09 September 2009, 11:38:58 UTC | push: make non-fast-forward help message configurable This message is designed to help new users understand what has happened when refs fail to push. However, it does not help experienced users at all, and significantly clutters the output, frequently dwarfing the regular status table and making it harder to see. This patch introduces a general configuration mechanism for optional messages, with this push message as the first example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2009, 04:33:20 UTC |
| 25fc178 | Johannes Sixt | 11 September 2009, 17:45:07 UTC | pager: set LESS=FRSX also on Windows Previously, this environment variable was set in the pager_preexec callback, which is conditionally-compiled only on Unix, because it is not, and cannot be, called on Windows. With this patch the env member of struct child_process is used to set the environment variable, which also works on Windows. Noticed by Alexey Borzenkov. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2009, 23:35:08 UTC |
| 2affea4 | Johannes Sixt | 11 September 2009, 17:40:08 UTC | start_command: do not clobber cmd->env on Windows code path Previously, it would not be possible to call start_command twice for the same struct child_process that has env set. The fix is achieved by moving the loop that modifies the environment block into a helper function. This also allows us to make two other helper functions static. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2009, 23:33:54 UTC |
| 59b8d38 | Tay Ray Chuan | 09 September 2009, 12:33:50 UTC | http.c: remove verification of remote packs Make http.c::fetch_pack_index() no longer check for the remote pack with a HEAD request before fetching the corresponding pack index file. Not only does sending a HEAD request before we do a GET incur a performance penalty, it does not offer any significant error- prevention advantages (pack fetching in the *_http_pack_request() methods is capable of handling any errors on its own). This addresses an issue raised elsewhere: http://code.google.com/p/msysgit/issues/detail?id=323 http://support.github.com/discussions/repos/957-cant-clone-over-http-or-git Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2009, 08:45:36 UTC |
| 434a6db | Nicolas Sebrecht | 11 September 2009, 00:29:58 UTC | add documentation for mailinfo.scissors and '--no-scissors' Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2009, 07:23:07 UTC |
| e019961 | Nicolas Sebrecht | 11 September 2009, 00:09:20 UTC | mailinfo: add '--scissors' to usage message Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2009, 07:11:44 UTC |
| 5beb577 | Brian Gernhardt | 10 September 2009, 20:28:19 UTC | INSTALL: Describe dependency knobs from Makefile We said that some of our dependencies were optional, but didn't say how to turn them off. Add information for that and mention where to save the options close to the top of the file. Also, standardize on both using quotes for the names of the dependencies and tabs for indentation of the list. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2009, 04:34:43 UTC |
| 26d9443 | Brian Gernhardt | 09 September 2009, 01:51:00 UTC | INSTALL: Reorder dependencies, split shell and Perl The most important and non-optional dependencies should go first, so put them there. While we're moving them, the descriptions for shell and perl were archaic, referring to "bare-bones Porcelainish scripts" that have become powerful and essential. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2009, 04:34:36 UTC |
| 1d7367d | Reilly Grant | 10 September 2009, 07:02:38 UTC | git-p4: Avoid modules deprecated in Python 2.6. The popen2, sha and sets modules are deprecated in Python 2.6 (sha in Python 2.5). Both popen2 and sha are not actually used in git-p4. Replace usage of sets.Set with the builtin set object. The built-in set object was added in Python 2.4 and is already used in other parts of this script, so this dependency is nothing new. Signed-off-by: Reilly Grant <reillyeon@qotw.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2009, 18:22:22 UTC |
| 0460dba | Brian Gernhardt | 08 September 2009, 13:54:38 UTC | Makefile: Add NEEDS_CRYPTO_WITH_SSL The Makefile comment for NEEDS_SSL_WITH_CRYPTO says to define it "if you need -lcrypto with -lssl (Darwin)." However, what it actually does is add -lssl when you use -lcrypto and not the other way around. However, libcrypto contains a majority of the ERR_* functions from OpenSSL (at least on OS X) so we need it both ways. So, add NEEDS_CRYPTO_WITH_SSL which adds -lcrypto to the OpenSSL link flags and clarify the difference between it and NEEDS_SSL_WITH_CRYPTO. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2009, 17:22:05 UTC |
| c21398b | Paul Mackerras | 07 September 2009, 00:08:21 UTC | gitk: Show diff of commits at end of compare-commits output When comparing a string of commits, when we find two non-merge commits that differ, we now write the two commits to files and diff the files. This pulls out the logic for creating a temporary directory from external_diff into a separate procedure so that the new diffcommits procedure can use it. Because the diff command returns an exit status of 1 when the files differ, and Tcl treats that as an error, this adds catch {} around the close statements in getblobdiffline. At present this only removes the temporary files when gitk exits. It should remove them when the diff is done. Signed-off-by: Paul Mackerras <paulus@samba.org> | 10 September 2009, 11:46:28 UTC |
| aaa68dd | Martin Nordholts | 03 September 2009, 20:27:24 UTC | git.el: Use git-add-file for unmerged files, remove git-resolve-file Use `git-add-file' to mark unmerged files as resolved in the *git-status* buffer to be consistent with git's CLI instructions. Also remove `git-resolve-file' to make it clear that that "R" is a now a free keybinding. Signed-off-by: Martin Nordholts <martinn@src.gnome.org> Acked-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2009, 19:11:44 UTC |
| 3de8ba0 | Brian Gernhardt | 09 September 2009, 01:50:59 UTC | INSTALL: Update description of our SHA-1 code We haven't had Mozilla's code or an ARM optimized algorithm since 30ae47b. Reword the paragraph to give credit but not authorship to Mozilla. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2009, 06:32:43 UTC |
| fadd069 | Junio C Hamano | 08 September 2009, 05:43:11 UTC | merge-recursive: give less scary messages when merge did not start When unpack_trees() three-way merge logic is called from merge-recursive and finds that local changes are going to be clobbered, its plumbing level messages were given as errors first, and then the merge driver added even more scary message "fatal: merging of trees <a long object name> and <another long object name> failed". This is most often encountered by new CVS/SVN migrants who are used to start a merge from a dirty work tree. The saddest part is that the merge refused to run to prevent _any_ damage from being done to your work tree when these messages are given, but the messages look a lot more scarier than the conflicted case where the user needs to resolve them. Replace the plumbing level messages so that they talk about what it is protecting the user from, and end the messages with "Aborting." so that it becomes clear that the command did not do any harm. The final "merging of trees failed" message is superfluous, unless you are interested in debugging the merge-recursive itself. Squelch the current die() message by default, but allow it to help people who debug git with verbosity level 4 or greater. Unless there is some bug, an inner merge that does not touch working tree should not trigger any such error, so emit the current die() message when we see an error return from it while running the inner merge, too. It would also help people who debug git. We could later add instructions on how to recover (i.e. "stash changes away or commit on a side branch and retry") instead of the silent exit(128) I have in this patch, and then use Peff's advice.* mechanism to squelch it (e.g. "advice.mergeindirtytree"), but they are separate topics. Tested-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 September 2009, 21:46:36 UTC |
| 1c2eafb | Josh Triplett | 07 September 2009, 08:56:33 UTC | Add url.<base>.pushInsteadOf: URL rewriting for push only This configuration option allows systematically rewriting fetch-only URLs to push-capable URLs when used with push. For instance: [url "ssh://example.org/"] pushInsteadOf = "git://example.org/" This will allow clones of "git://example.org/path/to/repo" to subsequently push to "ssh://example.org/path/to/repo", without manually configuring pushurl for that remote. Includes documentation for the new option, bash completion updates, and test cases (both that pushInsteadOf applies to push, that it does not apply to fetch, and that it is ignored when pushURL is already defined). Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 September 2009, 08:18:46 UTC |
| 5ad9dce | Junio C Hamano | 08 September 2009, 00:20:02 UTC | GIT 1.6.5-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 September 2009, 00:20:02 UTC |
| df01e7c | Junio C Hamano | 07 September 2009, 22:45:48 UTC | Merge branch 'maint' * maint: git-pull: do not mention --quiet and --verbose twice githooks.txt: put hooks into subsections | 07 September 2009, 22:45:48 UTC |
| 90e4311 | Emmanuel Trillaud | 07 September 2009, 12:34:35 UTC | git-pull: do not mention --quiet and --verbose twice git-pull.txt includes fetch-options.txt and merge-options.txt, both of which document the --quiet and --verbose. Supress the ones from fetch-options.txt. Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2009, 22:45:13 UTC |
| 6d71c1d | Bert Wesarg | 06 September 2009, 10:22:58 UTC | githooks.txt: put hooks into subsections All hooks are currently in its own section. Which may confuse users, because the section name serves as the hook file name and sections are all caps for man pages. Putting them into a new HOOKS section and each hook into a subsection keeps the case to lower case. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2009, 22:45:13 UTC |
| b8711f5 | Junio C Hamano | 07 September 2009, 22:25:37 UTC | Merge branch 'jc/mailinfo-scissors' * jc/mailinfo-scissors: mailinfo.scissors: new configuration am/mailinfo: Disable scissors processing by default Documentation: describe the scissors mark support of "git am" Teach mailinfo to ignore everything before -- >8 -- mark builtin-mailinfo.c: fix confusing internal API to mailinfo() | 07 September 2009, 22:25:37 UTC |
| 2da9f8e | Junio C Hamano | 07 September 2009, 22:24:53 UTC | Merge branch 'jk/clone-b' * jk/clone-b: clone: add --branch option to select a different HEAD | 07 September 2009, 22:24:53 UTC |
| e4d1afb | Junio C Hamano | 07 September 2009, 22:24:47 UTC | Merge branch 'jc/upload-pack-hook' * jc/upload-pack-hook: upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook upload-pack: add a trigger for post-upload-pack hook | 07 September 2009, 22:24:47 UTC |
| 54f0bdc | Junio C Hamano | 07 September 2009, 22:24:38 UTC | Merge branch 'tr/reset-checkout-patch' * tr/reset-checkout-patch: stash: simplify defaulting to "save" and reject unknown options Make test case number unique tests: disable interactive hunk selection tests if perl is not available DWIM 'git stash save -p' for 'git stash -p' Implement 'git stash save --patch' Implement 'git checkout --patch' Implement 'git reset --patch' builtin-add: refactor the meat of interactive_add() Add a small patch-mode testing library git-apply--interactive: Refactor patch mode code Make 'git stash -k' a short form for 'git stash save --keep-index' | 07 September 2009, 22:24:38 UTC |
| 8e4384f | Junio C Hamano | 07 September 2009, 22:23:50 UTC | Merge branch 'np/maint-1.6.3-deepen' * np/maint-1.6.3-deepen: pack-objects: free preferred base memory after usage make shallow repository deepening more network efficient | 07 September 2009, 22:23:50 UTC |
| 493b7a0 | Clemens Buchacher | 05 September 2009, 12:31:17 UTC | grep: accept relative paths outside current working directory "git grep" would barf at relative paths pointing outside the current working directory (or subdirectories thereof). Use quote_path_relative(), which can handle such cases just fine. [jc: added tests.] Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2009, 22:03:04 UTC |
| 929e37d | Clemens Buchacher | 07 September 2009, 08:48:01 UTC | grep: fix exit status if external_grep() punts If external_grep() is called and punts, grep_cache() mistakenly reported a hit, even if there were none. The bug can be triggered by calling "git grep --no-color" from a subdirectory. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2009, 22:02:31 UTC |
| d071d94 | Josh Triplett | 07 September 2009, 08:56:00 UTC | Wrap rewrite globals in a struct in preparation for adding another set remote.c has a global set of URL rewrites, accessed by alias_url and make_rewrite. Wrap them in a new "struct rewrites", passed to alias_url and make_rewrite. This allows adding other sets of rewrites. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2009, 19:58:45 UTC |
| 6ea71fe | Junio C Hamano | 06 September 2009, 07:39:32 UTC | Merge branch 'maint' * maint: push: re-flow non-fast-forward message push: fix english in non-fast-forward message | 06 September 2009, 07:39:32 UTC |
| 14b772a | Jeff King | 06 September 2009, 06:47:20 UTC | push: re-flow non-fast-forward message The extreme raggedness of the right edge make this jarring to read. Let's re-flow the text to fill the lines in a more even way. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2009, 07:39:15 UTC |
