| 503f464 | Junio C Hamano | 02 May 2009, 06:31:00 UTC | GIT 1.6.3-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 May 2009, 06:31:00 UTC |
| a8816e7 | Junio C Hamano | 02 May 2009, 05:11:57 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Fixes for Mac OS X TkAqua git-gui: Update Russian translation git-gui: run post-checkout hook after clone git-gui: Ensure consistent usage of mergetool.keepBackup git-gui: fix use of undeclared variable diff_empty_count git-gui (Win): make starting via "Git GUI Here" on .git/ possible git-gui (Win): make "Explore Working Copy" more robust git-gui: run post-checkout hook on checkout git-gui: When calling post-commit hook wrong variable was cleared. git-gui: use `git --html-path` to get the location of installed HTML docs git-gui: fix deleting from the context menu with empty selection git-gui: minor spelling fix and string factorisation. git-gui: various French translation fixes git-gui: Fix merge conflict display error when filename contains spaces git-gui: don't hide the Browse button when resizing the repo chooser Append ampersand to "Target" of lnk files created by do_cygwin_shortcut git-gui: Support more git version notations. git-gui: Avoid an infinite rescan loop in handle_empty_diff. git-gui: Fix post-commit status with subject in non-locale encoding | 02 May 2009, 05:11:57 UTC |
| 1087aba | René Scharfe | 01 May 2009, 20:03:07 UTC | ctype.c: fix typo in comment Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2009, 23:07:29 UTC |
| 4b25d09 | Felipe Contreras | 01 May 2009, 09:06:36 UTC | Fix a bunch of pointer declarations (codestyle) Essentially; s/type* /type */ as per the coding guidelines. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2009, 22:17:31 UTC |
| a91be3f | Daniel A. Steffen | 16 August 2008, 01:20:09 UTC | git-gui: Fixes for Mac OS X TkAqua - detect more Tk.framework variants - fix apple menu setup, use native preferences menu item - don't set menu font Signed-off-by: Daniel A. Steffen <das@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 May 2009, 22:04:52 UTC |
| 75b4406 | Junio C Hamano | 01 May 2009, 02:56:28 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add Russian translation gitk: Fix compare-commits function when we have local changes gitk: Avoid crash if closed while reading references gitk: Handle external diff tool with spaces in the path gitk: Remember and restore the window state with the geometry gitk: Map KP_Divide to focus the search box gitk: Mark some more strings for translation gitk: Mark forgotten string for translation gitk: Make .gitk a hidden file under windows gitk: Add a command to compare two strings of commits gitk: Add a way to mark a commit, plus a "find descendant" command gitk: Fixes for Mac OS X TkAqua gitk: Provide a 32x32 window icon based on the git logo gitk: Provide a window icon if possible gitk: Handle blobs containing a DOS end-of-file marker | 01 May 2009, 02:56:28 UTC |
| ad7ef5b | Alex Riesen | 27 April 2009, 18:04:27 UTC | gitk: Add Russian translation Thanks go to Dmitry Potapov for proofreading and suggested translation of the word 'merge'. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 30 April 2009, 23:34:24 UTC |
| 6ffd567 | Alex Riesen | 29 April 2009, 21:27:54 UTC | improve error message in config.c Show errno if opening a lockfile fails. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2009, 01:37:58 UTC |
| d1c8c0c | Junio C Hamano | 29 April 2009, 23:50:31 UTC | Merge branch 'maint' * maint: diff -c -p: do not die on submodules Conflicts: combine-diff.c | 29 April 2009, 23:50:31 UTC |
| 3e8a00a | Benjamin Kramer | 27 April 2009, 13:59:49 UTC | daemon.c: fix segfault on OS X On OS X (and maybe other unices), getaddrinfo(3) returns NULL in the ai_canonname field if it's called with an IP address for the hostname. We'll now use the IP address for the hostname if ai_canonname was NULL, this also matches the behaviour on Linux. steps to reproduce: $ git daemon --export-all $ git clone git://127.0.0.1/frotz => git daemon's fork (silently) segfaults. Remove the pointless loop while at it. There is only one iteration because of the break; on the last line and there are no continues. Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2009, 23:50:21 UTC |
| 0c44c94 | Junio C Hamano | 29 April 2009, 18:08:18 UTC | merge-recursive: do not die on a conflicting submodule We cannot represent the 3-way conflicted state in the work tree for these entries, but it is normal not to have commit objects for them in our repository. Just update the index and the life will be good. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2009, 23:50:21 UTC |
| d212ca1 | Felipe Contreras | 29 April 2009, 22:49:47 UTC | git config: error when editing a repo config and not being in one Let's throw an error on this specific case. If the user specifies the config file, he must know what he is doing. Teemu Likonen pointed this out. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2009, 23:50:21 UTC |
| 2163e3f | Uwe Kleine-König | 28 April 2009, 20:29:24 UTC | parseopt: fix documentation for --keep-dashdash Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2009, 23:50:10 UTC |
| 348df16 | Johannes Schindelin | 27 April 2009, 22:32:25 UTC | Rename core.unreliableHardlinks to core.createObject "Unreliable hardlinks" is a misleading description for what is happening. So rename it to something less misleading. Suggested by Linus Torvalds. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2009, 23:50:07 UTC |
| a2dc04b | Junio C Hamano | 29 April 2009, 22:40:33 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: diff -c -p: do not die on submodules | 29 April 2009, 22:40:33 UTC |
| 9347473 | Junio C Hamano | 29 April 2009, 20:43:13 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: diff -c -p: do not die on submodules | 29 April 2009, 20:43:13 UTC |
| 7dae8b2 | Junio C Hamano | 29 April 2009, 19:49:52 UTC | diff -c -p: do not die on submodules The combine diff logic knew only about blobs (and their checked-out form in the work tree, either regular files or symlinks), and barfed when fed submodules. This "externalizes" gitlinks in the same way as the normal patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2009, 19:49:52 UTC |
| c736b4c | Alex Riesen | 29 April 2009, 05:56:06 UTC | git-gui: Update Russian translation Also, the previous translations of the words 'tag' and 'merge' were changed. Added translation of the 'Tool' submenu. Thanks go to Alexander Gavrilov and Dmitry Potapov for proofreading and suggestions. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 April 2009, 15:37:23 UTC |
| 26e47f2 | Eric Blake | 28 April 2009, 12:28:32 UTC | doc: consistently use ASCIIDOC_EXTRA For all uses of $(ASCIIDOC) in Documentation/Makefile, supply the same options via $(ASCIIDOC_EXTRA). Signed-off-by: Eric Blake <ebb9@byu.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2009, 18:50:18 UTC |
| d4b1902 | Eric Blake | 28 April 2009, 12:28:31 UTC | Makefile: installing git in cygwin 1.7.0 On platforms with $X, make removes any leftover scripts 'a' from earlier builds if a new binary 'a.exe' is now built. However, on cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file. Test for file equality before attempting a remove, in order to avoid nuking just-built binaries. This repeats commit 0d768f7 for the installation destdir. Signed-off-by: Eric Blake <ebb9@byu.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2009, 18:47:54 UTC |
| b79376c | Junio C Hamano | 28 April 2009, 07:46:39 UTC | Merge branch 'maint' * maint: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message | 28 April 2009, 07:46:39 UTC |
| 2254da0 | Junio C Hamano | 28 April 2009, 07:46:25 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message | 28 April 2009, 07:46:25 UTC |
| 3e73cb2 | Junio C Hamano | 28 April 2009, 07:46:20 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message | 28 April 2009, 07:46:20 UTC |
| 47afed5 | Sam Vilain | 27 April 2009, 14:38:47 UTC | SubmittingPatches: itemize and reflect upon well written changes The SubmittingPatches file was trimmed down from a somewhat overwhelming set of requirements from the Linux Kernel equivalent; however perhaps a little of it can be returned without making the text too long. Signed-off-by: Sam Vilain <sam@vilain.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2009, 07:40:00 UTC |
| 62f780d | Jeff King | 28 April 2009, 03:34:24 UTC | Makefile: fix NO_PERL bug with gitweb When the user has defined NO_PERL, we want to skip building gitweb entirely. However, the conditional to add gitweb/gitweb.cgi to OTHER_PROGRAMS was evaluated before we actually parsed the user's config.mak. This meant that "make NO_PERL=NoThanks" worked fine, but putting "NO_PERL=NoThanks" into your config.mak broke the build (it wanted gitweb.cgi to satisfy "all", but the rule to build it was conditionally ignored, so it complained). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2009, 05:59:38 UTC |
| c922b01 | Linus Torvalds | 27 April 2009, 18:10:24 UTC | grep: fix segfault when "git grep '('" is given Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2009, 00:28:18 UTC |
| b9d622e | Johannes Schindelin | 27 April 2009, 22:12:31 UTC | t5701: do not get stuck in empty-push/ A test might happen to be the last one in the script, but other people later may want to add more tests after your test is done. Do not surprise them by going in a subdirectory to run a part of your test and never coming out of it. This fixes a162e78 in that respect. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2009, 23:33:53 UTC |
| 9a695fb | Patrick Welche | 26 April 2009, 13:49:00 UTC | NetBSD compilation fix Similar to other BSD variants, it needs USE_ST_TIMESPEC. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2009, 16:54:24 UTC |
| d649048 | Allan Caffee | 13 April 2009, 18:11:21 UTC | Documentation: fix a grammatical error in api-builtin.txt Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2009, 16:36:40 UTC |
| 345f6e2 | Allan Caffee | 13 April 2009, 18:10:08 UTC | builtin-merge: fix a typo in an error message Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2009, 16:36:14 UTC |
| fe4a9c3 | Mark Drago | 27 April 2009, 02:36:48 UTC | Add semicolon to curly brace group in main Makefile This semicolon is technically required by POSIX shell and indeed causes a syntax error with e.g. bash-2.04.0. Cf. http://www.opengroup.org/onlinepubs/000095399/utilities/xcu_chap02.html#tag_02_09_04_01 Signed-off-by: Mark Drago <markdrago@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2009, 08:07:08 UTC |
| 531e6da | Johannes Sixt | 27 April 2009, 07:44:58 UTC | prune-packed: advanced progress even for non-existing fan-out directories A progress indicator is used to count through the 256 object fan-out directories while unused object files are removed. (However, it becomes visible only if this process takes long enough.) Previously, display_progress() was only called if object files were actually removed. But if directories towards the end (fd/, fe/, ff/) did not exist, this could leave a strange line Removing duplicate objects: 99% (255/256), done. in the terminal instead of the expected "100% (256/256)". Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2009, 08:06:35 UTC |
| 95110d7 | Linus Torvalds | 26 April 2009, 19:29:13 UTC | t4202: fix typo While I did a make -j64 test > ~/t.out to check my previous patch (in case some test actually tested 'trustctime' or something), I noticed this one. Somebody has speeling trouble: t4202-log.sh: line 345: test_expect_sucess: command not found Fixed thus. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 April 2009, 23:20:25 UTC |
| be66a6c | Johannes Schindelin | 25 April 2009, 09:57:14 UTC | Add an option not to use link(src, dest) && unlink(src) when that is unreliable It seems that accessing NTFS partitions with ufsd (at least on my EeePC) has an unnerving bug: if you link() a file and unlink() it right away, the target of the link() will have the correct size, but consist of NULs. It seems as if the calls are simply not serialized correctly, as single-stepping through the function move_temp_to_file() works flawlessly. As ufsd is "Commertial software" (sic!), I cannot fix it, and have to work around it in Git. At the same time, it seems that this fixes msysGit issues 222 and 229 to assume that Windows cannot handle link() && unlink(). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 16:49:21 UTC |
| 785a985 | Benjamin Kramer | 24 April 2009, 12:16:41 UTC | connect: replace inet_ntop with getnameinfo inet_ntop is not protocol independent. getnameinfo(3) is part of POSIX and is available when getaddrinfo(3) is. This code is only compiled when NO_IPV6 isn't defined. The old method was buggy anyway, not every ipv6 address was converted properly because the buffer (addr) was too small. Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 16:29:38 UTC |
| 911198f | Wesley J. Landaker | 25 April 2009, 15:13:41 UTC | Documentation: git-clean: make description more readable The existing text is a little bit awkward. This rewrites the description section to be more readable and friendly. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 16:29:38 UTC |
| 926337f | Wesley J. Landaker | 25 April 2009, 15:13:40 UTC | Documentation: git-clean: fix minor grammatical errors There were a few minor grammatical errors that made this paragraph hard to read. This patch fixes the errors in a very minimal manner. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 16:29:38 UTC |
| c5fe5b6 | Sitaram Chamarty | 25 April 2009, 10:56:52 UTC | Remove obsolete bug warning in man git-update-server-info The bug referred to was fixed in 60d0526 Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 16:29:38 UTC |
| 1ef2d5a | Brandon Casey | 24 April 2009, 23:18:53 UTC | t7700-repack: repack -a now works properly, expect success from test Since the recent rework of the object listing mechanism of pack-objects/rev-list, git-repack now properly packs objects from alternate repositories even when the local repository contains packs. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 15:54:18 UTC |
| 84eeb68 | Brandon Casey | 24 April 2009, 23:18:52 UTC | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' The '--no-thread' option is a Getopt::Long boolean option. The '--no-' prefix (as in --no-thread) for boolean options is not supported in Getopt::Long version 2.32 which was released with Perl 5.8.0. This version only supports '--no' as in '--nothread'. More recent versions of Getopt::Long, such as version 2.34, support either prefix. So use the older form in the tests. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 15:54:18 UTC |
| 6691328 | Nicolas Pitre | 24 April 2009, 21:46:15 UTC | progress bar: round to the nearest instead of truncating down Often the throughput output is requested when the data read so far is one smaller than multiple of 1024; because 1023/1024 is ~0.999, it often shows up as 0.99 because the code currently truncates. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 15:54:18 UTC |
| f29ac4f | Junio C Hamano | 25 April 2009, 05:54:40 UTC | GIT 1.6.3-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2009, 05:59:35 UTC |
| 86e081a | Junio C Hamano | 25 April 2009, 05:59:08 UTC | Merge branch 'maint' * maint: test-genrandom: Add newline to usage string | 25 April 2009, 05:59:08 UTC |
| f06b9f1 | Junio C Hamano | 25 April 2009, 05:58:31 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: test-genrandom: Add newline to usage string | 25 April 2009, 05:58:31 UTC |
| cc13719 | Junio C Hamano | 25 April 2009, 05:49:34 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: test-genrandom: Add newline to usage string | 25 April 2009, 05:49:34 UTC |
| a766829 | Jeff King | 24 April 2009, 13:56:14 UTC | t7800: respect NO_PERL Difftool is written in perl, so we don't build it if NO_PERL is set. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2009, 16:24:35 UTC |
| cd294bc | Johannes Sixt | 23 April 2009, 13:49:05 UTC | remote.c: do not trigger remote.<name>.<var> codepath for two-level names If the config file contains a section like this: [remote] default = foo (it should be '[remotes]') then commands like git status git checkout git branch -v fail even though they are not obviously related to remotes. (These commands write "ahead, behind" information and, therefore, access the per-remote information). Unknown configuration keys should be ignored, not trigger errors. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2009, 08:29:28 UTC |
| 178b513 | Johannes Sixt | 23 April 2009, 13:49:06 UTC | builtin-help: silently tolerate unknown keys If for some reason the config file contains a key without a subkey like [man] foo = bar then even a plain git help produces an error message. With this patch such an entry is ignored. Additionally, the warning about unknown sub-keys is removed. It could become annoying if new sub-keys are introduced in the future, and then the configuration is read by an old version of git that does not know about it. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2009, 08:29:13 UTC |
| 677fbff | Alex Riesen | 23 April 2009, 19:18:09 UTC | Explain seemingly pointless use of system in difftool Portability reasons. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2009, 08:20:35 UTC |
| 5be3b17 | Junio C Hamano | 23 April 2009, 05:42:28 UTC | Makefile: ignore perl/ subdirectory under NO_PERL The install target still descends into perl subdirectory when NO_PERL is requested. Fix this. Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 19:53:32 UTC |
| 66e35fc | Stephen Boyd | 23 April 2009, 09:38:02 UTC | config.txt: Make configuration paragraph more consistent By renaming 'information' to 'configuration' we capture more clearly what a configuration file holds. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 19:53:32 UTC |
| b7ee226 | Stephen Boyd | 23 April 2009, 09:38:01 UTC | config.txt: clarify sentences in the configuration and syntax sections Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 19:53:31 UTC |
| 773002a | Stephen Boyd | 23 April 2009, 09:38:00 UTC | config.txt: add missing 'the's and make words plural Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 19:53:31 UTC |
| 50710ce | Stephen Boyd | 23 April 2009, 16:16:52 UTC | git-format-patch.txt: general rewordings and cleanups Clarify --no-binary description using some words from the original commit 37c22a4b (add --no-binary, 2008-05-9). Cleanup --suffix description. Add --thread style option to synopsis and reorganize it a bit. Clarify renaming patches example and the configuration paragraph. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 19:53:16 UTC |
| a123978 | Stephen Boyd | 23 April 2009, 09:37:58 UTC | git-show-branch.txt: cleanup example description Add a missing quote and properly escape the ' character so docs don't look odd. Add 'the' to make some sentences more gramatically correct. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 11:21:22 UTC |
| fd1ff30 | Stephen Boyd | 23 April 2009, 09:37:57 UTC | Documentation: use lowercase for shallow and deep threading Even when a sentence is started with 'shallow' or 'deep' use the lowercase version to maintain consistency. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 11:20:34 UTC |
| 48d3448 | Stephen Boyd | 23 April 2009, 09:37:56 UTC | config.txt: add missing format.{subjectprefix,cc,attach} variables Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 11:20:12 UTC |
| c231822 | Stephen Boyd | 23 April 2009, 07:25:33 UTC | test-genrandom: Add newline to usage string A minor fix to place the terminal input on a new line if test-genrandom is run with no arguments. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 08:29:00 UTC |
| ea0b767 | Junio C Hamano | 23 April 2009, 02:36:19 UTC | Merge branch 'jc/maint-read-tree-multi' * jc/maint-read-tree-multi: checkout branch: prime cache-tree fully read-tree -m A B: prime cache-tree from the switched-to tree Move prime_cache_tree() to cache-tree.c read-tree A B: do not corrupt cache-tree | 23 April 2009, 02:36:19 UTC |
| 7613ea3 | Bill Pemberton | 22 April 2009, 13:41:29 UTC | Add parsing of elm aliases to git-send-email elm stores a text file version of the aliases that is <alias> = <comment> = <email address> This adds the parsing of this file to git-send-email Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 02:10:41 UTC |
| 7bd93c1 | Dan Loewenherz | 23 April 2009, 01:46:02 UTC | Convert to use quiet option when available A minor fix that eliminates usage of "2>/dev/null" when --quiet or -q has already been implemented. Signed-off-by: Dan Loewenherz <daniel.loewenherz@yale.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 02:05:37 UTC |
| b18cc5a | Michael J Gruber | 22 April 2009, 21:15:56 UTC | Fix more typos/spelling in comments A few more fixes on top of the automatic spell checker generated ones. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 02:03:39 UTC |
| 3ea3c21 | Mike Ralphson | 17 April 2009, 18:13:30 UTC | Fix typos / spelling in comments Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 02:02:12 UTC |
| bad542f | Wesley J. Landaker | 22 April 2009, 15:48:58 UTC | Documentation: git-svn: fix a grammatical error without awkwardness The way the sentence is currently written, there needs to be an "its", but this leads to: "however the remote wildcard may be anywhere as long as it's its own" which is awkward to read. Instead, this patch fixes he grammar in a simpler way. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 01:40:33 UTC |
| 4ddef0e | Wesley J. Landaker | 22 April 2009, 15:48:57 UTC | Documentation: git-svn: fix spurious bolding that mangles the output Without this fix, the output looks like: "Keep in mind that the (asterisk) wildcard of the local ref (right of the :) *must be the ..." -- with half the sentence spuriously bold. This fixes the problem by simply escaping asciidoc syntax as suggested by Jeff King <peff@peff.net>. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 01:39:57 UTC |
| e8d1180 | Alex Riesen | 22 April 2009, 07:27:22 UTC | Wait for git diff to finish in git difftool In ActivetState Perl, exec does not wait for the started program. This breaks difftool tests and may cause unexpected behaviour: git difftool has returned, but the rest of code (diff and possibly the interactive program are still running in the background. Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 01:39:21 UTC |
| a6c1a38 | Allan Caffee | 22 April 2009, 21:27:59 UTC | graph API: fix a bug in the rendering of octopus merges An off by one error was causing octopus merges with 3 parents to not be rendered correctly. This regression was introduced by 427fc5. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 00:49:56 UTC |
| 36a31fe | Allan Caffee | 22 April 2009, 19:52:13 UTC | graph API: fix extra space during pre_commit_line state An extra space is being inserted between the "commit" column and all of the successive edges. Remove this space. This regression was introduced by 427fc5b. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 00:48:42 UTC |
| 7b1d626 | Allan Caffee | 22 April 2009, 21:27:15 UTC | t4202-log: extend test coverage of graphing Extend this test to cover the rendering of graphs with octopus merges and pre_commit lines. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2009, 00:48:22 UTC |
| 8fbf879 | Junio C Hamano | 21 April 2009, 23:32:18 UTC | Revert "stat_tracking_info(): only count real commits" This reverts commit 19de5d6913b9681d2bde533bccc8445c9236a648. It produces a misleading output to decide if a merge can fast-forward. | 21 April 2009, 23:33:20 UTC |
| 3a04832 | Michael J Gruber | 21 April 2009, 09:21:59 UTC | test-lib.sh: Help test_create_repo() find the templates dir Currently, test_create_repo() expects that templates can be found below `pwd`/.. This assumption fails when tests are run against a git installed somewhere else or test_create_repo() is called from subdirectiories (several tests do this). Therefore, use $TEST_DIRECTORY as introduced in 2d84e9fb and expect templates to be present in $TEST_DIRECTORY/.. which should be the root dir of the git checkout. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2009, 16:49:04 UTC |
| 6f63fc1 | Paul Mackerras | 21 April 2009, 12:22:31 UTC | gitk: Fix compare-commits function when we have local changes This fixes a bug in the compare-commits function added in commit 010509f2 ("gitk: Add a command to compare two strings of commits") where gitk would show an error dialog if the comparison of commits got to a fake commit (one showing local changes). It extends getpatchid to handle these fake commits by using [diffcmd] to get the git diff command variant to use, and also handles the situation where an error occurs. Now that we can have the fake commit IDs showing up, which are 00..00 and 00..01, the short ID is ambiguous. To make sure the links point to the right commit, this adds a new [appendshortlink] procedure which takes the full link destination, and uses that rather than appendwithlinks. Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 April 2009, 12:22:31 UTC |
| 0be9bc0 | Junio C Hamano | 21 April 2009, 07:16:09 UTC | Merge branch 'mk/maint-apply-swap' * mk/maint-apply-swap: tests: make test-apply-criss-cross-rename more robust builtin-apply: keep information about files to be deleted tests: test applying criss-cross rename patch Conflicts: t/t4130-apply-criss-cross-rename.sh | 21 April 2009, 07:16:09 UTC |
| 062868c | Junio C Hamano | 21 April 2009, 07:00:40 UTC | Merge branch 'maint' * maint: gitcvs-migration: Link to git-cvsimport documentation Fix off-by-one in read_tree_recursive | 21 April 2009, 07:00:40 UTC |
| fe3420b | Markus Heidelberg | 20 April 2009, 22:58:15 UTC | grep: don't support "grep.color"-like config options color.grep and color.grep.* is the official and documented way to highlight grep matches. Comparable options like diff.color.* and status.color.* exist for backward compatibility reasons only and are not documented any more. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2009, 05:55:56 UTC |
| 680ebc0 | Mike Ralphson | 17 April 2009, 18:13:28 UTC | Documentation: fix typos / spelling mistakes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 22:56:07 UTC |
| 7c0282b | Mike Ralphson | 17 April 2009, 18:13:29 UTC | builtin-remote: fix typo in option description Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 22:55:56 UTC |
| a162e78 | Matthieu Moy | 20 April 2009, 11:09:37 UTC | clone: add test for push on an empty clone. Commit 55f0566 (get_local_heads(): do not return random pointer if there is no head, 2009-04-17) fixed a segfault for git push, this patch adds a test-case to avoid future regressions. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 20:53:03 UTC |
| f058386 | Michał Kiedrowicz | 18 April 2009, 21:03:57 UTC | tests: make test-apply-criss-cross-rename more robust I realized that this test does check if git-apply succeeds, but doesn't tell if it applies patches correctly. So I added test_cmp to check it. I also added a test which checks swapping three files. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 20:47:02 UTC |
| e8141fc | Michał Kiedrowicz | 11 April 2009, 19:31:00 UTC | builtin-apply: keep information about files to be deleted Example correct diff generated by `diff -M -B' might look like this: diff --git a/file1 b/file2 similarity index 100% rename from file1 rename to file2 diff --git a/file2 b/file1 similarity index 100% rename from file2 rename to file1 Information about removing `file2' comes after information about creation of new `file2' (renamed from `file1'). Existing implementation isn't able to apply such patch, because it has to know in advance which files will be removed. This patch populates fn_table with information about removal of files before calling check_patch() for each patch to be applied. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 20:46:58 UTC |
| 1d49f0d | Michał Kiedrowicz | 11 April 2009, 15:26:24 UTC | tests: test applying criss-cross rename patch Originally reported by Linus in $gmane/116198 Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 20:46:55 UTC |
| 3ac3cfb | Frank Lichtenheld | 18 April 2009, 14:38:42 UTC | gitcvs-migration: Link to git-cvsimport documentation Signed-off-by: Frank Lichtenheld <flichtenheld@astaro.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 20:45:02 UTC |
| 7183c09 | Johannes Schindelin | 20 April 2009, 17:44:53 UTC | Fix off-by-one in read_tree_recursive Found by valgrind. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 20:44:14 UTC |
| 34779c5 | Johannes Sixt | 20 April 2009, 08:17:00 UTC | Windows: Skip fstat/lstat optimization in write_entry() Commit e4c72923 (write_entry(): use fstat() instead of lstat() when file is open, 2009-02-09) introduced an optimization of write_entry(). Unfortunately, we cannot take advantage of this optimization on Windows because there is no guarantee that the time stamps are updated before the file is closed: "The only guarantee about a file timestamp is that the file time is correctly reflected when the handle that makes the change is closed." (http://msdn.microsoft.com/en-us/library/ms724290(VS.85).aspx) The failure of this optimization on Windows can be observed most easily by running a 'git checkout' that has to update several large files. In this case, 'git checkout' will report modified files, but infact only the timestamps were incorrectly recorded in the index, as can be verified by a subsequent 'git diff', which shows no change. Dmitry Potapov reports the same fix needs on Cygwin; this commit contains his updates for that. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 19:14:02 UTC |
| 83ae209 | Junio C Hamano | 20 April 2009, 10:58:20 UTC | checkout branch: prime cache-tree fully When switching to another branch, the earlier code relied on incremental invalidation of cache-tree entries to degrade it. While it is not wrong per-se, we know that the resulting index must fully match the branch we are switching to unless the -m (merge) option is used. We should simply fully re-prime the cache-tree using the new tree object in such a case. And for safety, invalidate the cache-tree as a whole in other cases. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 11:16:42 UTC |
| 456156d | Junio C Hamano | 20 April 2009, 10:58:19 UTC | read-tree -m A B: prime cache-tree from the switched-to tree When switching to a new branch with "read-tree -m A B", the resulting index must match tree B and we can prime the cache tree with it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 11:16:41 UTC |
| b9d37a5 | Junio C Hamano | 20 April 2009, 10:58:18 UTC | Move prime_cache_tree() to cache-tree.c The interface to build cache-tree belongs there. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 11:16:41 UTC |
| 8cc21ce | Junio C Hamano | 20 April 2009, 10:58:17 UTC | read-tree A B: do not corrupt cache-tree An earlier commit aab3b9a (read-tree A B C: do not create a bogus index and do not segfault, 2009-03-12) resurrected the support for an obscure (but useful) feature to read and overlay more than one tree into the index without the -m (merge) option. But the fix was not enough. Exercising this feature exposes a longstanding bug in the code that primes the cache-tree in the index from the tree that was read. The intention was that when we know that the index must exactly match the tree we just read, we prime the entire cache-tree with it. However, the logic to detect that case incorrectly triggered if you read two trees without -m. This resulted in a corrupted cache-tree, and write-tree would have produced an incorrect tree object out of such an index. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 11:16:40 UTC |
| 6ac6f87 | Johannes Sixt | 03 April 2009, 06:49:59 UTC | Windows: Work around intermittent failures in mingw_rename We have replaced rename() with a version that can rename a file to a destination that already exists. Nevertheless, many users, the author included, observe failures in the code that are not reproducible. The theory is that the failures are due to some other process that happens to have opened the destination file briefly at the wrong moment. (And there is no way on Windows to delete or replace a file that is currently open.) The most likely candidate for such a process is a virus scanner. The failure is more often observed while there is heavy git activity (for example while the test suite is running or during a rebase operation). We work around the failure by retrying the rename operation if it failed due to ERROR_ACCESS_DENIED. The retries are delayed a bit: The first only by giving up the time slice, the next after the minimal scheduling granularity, and if more retries are needed, then we wait some non-trivial amount of time with exponential back-off. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 10:42:53 UTC |
| ccb4b53 | Holger Weiß | 31 March 2009, 16:16:36 UTC | gitweb: Fix snapshots requested via PATH_INFO Fix the detection of the requested snapshot format, which failed for PATH_INFO URLs since the references to the hashes which describe the supported snapshot formats weren't dereferenced appropriately. Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 10:42:23 UTC |
| 21590d5 | Junio C Hamano | 20 April 2009, 10:39:38 UTC | Merge branch 'mm/maint-add-p-quit' * mm/maint-add-p-quit: git add -p: add missing "q" to patch prompt | 20 April 2009, 10:39:38 UTC |
| a2fc8d6 | Wincent Colaiuta | 20 April 2009, 09:42:52 UTC | git add -p: add missing "q" to patch prompt Commit cbd3a01 added a new "q" subcommand to the "git add -p" command loop, but forgot to add it to the prompt. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 10:38:44 UTC |
| 66996ec | Junio C Hamano | 20 April 2009, 00:36:22 UTC | Sync with 1.6.2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 00:38:40 UTC |
| 1f9b620 | Junio C Hamano | 20 April 2009, 00:34:26 UTC | GIT 1.6.2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 00:34:26 UTC |
| 318b847 | Nguyễn Thái Ngọc Duy | 20 April 2009, 00:17:25 UTC | Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 00:23:42 UTC |
| 4f26c39 | Junio C Hamano | 19 April 2009, 19:40:17 UTC | Merge branch 'ef/maint-fast-export' into maint * ef/maint-fast-export: builtin-fast-export.c: handle nested tags builtin-fast-export.c: fix crash on tagged trees builtin-fast-export.c: turn error into warning test-suite: adding a test for fast-export with tag variants | 19 April 2009, 19:40:17 UTC |
| fe4ce3a | Junio C Hamano | 19 April 2009, 19:40:14 UTC | Merge branch 'mm/maint-add-p-quit' into maint * mm/maint-add-p-quit: Update git-add.txt according to the new possibilities of 'git add -p'. add-interactive: refactor mode hunk handling git add -p: new "quit" command at the prompt. | 19 April 2009, 19:40:14 UTC |
| 84047e0 | Junio C Hamano | 19 April 2009, 19:40:11 UTC | Merge branch 'lt/maint-reflog-expire' into maint * lt/maint-reflog-expire: Speed up reflog pruning of unreachable commits Clean up reflog unreachability pruning decision | 19 April 2009, 19:40:11 UTC |
| 5027acc | Junio C Hamano | 19 April 2009, 19:40:05 UTC | Merge branch 'jc/maint-shared-literally' into maint * jc/maint-shared-literally: Update docs on behaviour of 'core.sharedRepository' and 'git init --shared' t1301-shared-repo: fix forced modes test | 19 April 2009, 19:40:05 UTC |
| cafa567 | Matthieu Moy | 16 April 2009, 16:46:23 UTC | Update git-add.txt according to the new possibilities of 'git add -p'. The text is merely cut-and-pasted from git-add--interactive.perl. The cut-and-paste also fixes a typo. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2009, 19:35:38 UTC |
