| f01f109 | Junio C Hamano | 07 May 2009, 00:13:27 UTC | GIT 1.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 May 2009, 01:16:40 UTC |
| c5ae7cb | Nguyễn Thái Ngọc Duy | 06 May 2009, 14:33:34 UTC | t4029: use sh instead of bash Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 May 2009, 01:16:26 UTC |
| 5e16488 | Brandon Casey | 06 May 2009, 22:56:18 UTC | t4200: convert sed expression which operates on non-text file to perl POSIX only requires sed to work on text files and MERGE_RR is not a text file. Some versions of sed complain that this file is not newline terminated, and exit non-zero. Use perl instead which does not have a problem with it. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 23:43:29 UTC |
| 9eda0e9 | Brandon Casey | 06 May 2009, 22:56:17 UTC | t4200: remove two unnecessary lines These two lines appear to be unnecessary. They set variables which are not used afterwards. The primary motivation to remove them is that the sed invocation exits non-zero for seds which require newline termination of input files. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 23:43:28 UTC |
| d8b69ec | Brandon Casey | 06 May 2009, 18:29:16 UTC | t/annotate-tests.sh: avoid passing a non-newline terminated file to sed Some versions of sed exit non-zero if the file they are supplied is not newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. So rework this test to avoid doing so. This affects tests t8001-annotate.sh and t8002-blame.sh. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 18:50:44 UTC |
| 325fb15 | Brandon Casey | 06 May 2009, 18:29:15 UTC | t4118: avoid sed invocation on file without terminating newline Some versions of sed exit non-zero if the file they are supplied is not newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. In this case the sed invocation can be avoided entirely since the resulting file is equivalent to a previously created file. So, just copy that file into place instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 18:49:14 UTC |
| 7235704 | Brandon Casey | 06 May 2009, 18:29:14 UTC | t4118: add missing '&&' Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 18:49:05 UTC |
| 0b05dc2 | Brandon Casey | 06 May 2009, 18:31:42 UTC | t8005: use egrep when extended regular expressions are required Not all versions of grep understand backslashed extended regular expressions. Possibly only gnu grep does. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 18:48:58 UTC |
| 6a260f5 | Junio C Hamano | 06 May 2009, 17:48:26 UTC | git-clean doc: the command only affects paths under $(cwd) Fredrik Skolmli and Thomas Rast noticed that it was left unstated that "git clean" ran from a subdirectory will not affect anything outside it, with or without path limiters. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 17:51:34 UTC |
| 8146f19 | Junio C Hamano | 06 May 2009, 05:52:17 UTC | Merge branch 'maint' * maint: improve error message in config.c t4018-diff-funcname: add cpp xfuncname pattern to syntax test Work around BSD whose typeof(tv.tv_sec) != time_t git-am.txt: reword extra headers in message body git-am.txt: Use date or value instead of time or timestamp git-am.txt: add an 'a', say what 'it' is, simplify a sentence dir.c: Fix two minor grammatical errors in comments git-svn: fix a sloppy Getopt::Long usage | 06 May 2009, 05:52:17 UTC |
| 54e0e6e | Junio C Hamano | 06 May 2009, 05:51:49 UTC | Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint * rj/maint-1.6.0-svn-parse-fix: git-svn: fix a sloppy Getopt::Long usage | 06 May 2009, 05:51:49 UTC |
| 41f64ad | Junio C Hamano | 06 May 2009, 05:51:31 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: dir.c: Fix two minor grammatical errors in comments | 06 May 2009, 05:51:31 UTC |
| e88d022 | 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> | 06 May 2009, 05:49:43 UTC |
| 066e596 | Brandon Casey | 02 May 2009, 14:31:16 UTC | t4018-diff-funcname: add cpp xfuncname pattern to syntax test Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:49:02 UTC |
| f697b33 | Bernd Ahlers | 06 April 2009, 17:26:37 UTC | Work around BSD whose typeof(tv.tv_sec) != time_t According to POSIX, tv_sec is supposed to be a time_t, but OpenBSD (and FreeBSD, too) defines it to be a long, which triggers a type mismatch when a pointer to it is given to localtime_r(). Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:19:14 UTC |
| 7713e05 | Stephen Boyd | 04 May 2009, 06:46:58 UTC | git-am.txt: reword extra headers in message body Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:09:31 UTC |
| e77063f | Stephen Boyd | 05 May 2009, 05:19:00 UTC | git-am.txt: Use date or value instead of time or timestamp Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:09:02 UTC |
| 3db964b | Stephen Boyd | 05 May 2009, 05:18:42 UTC | git-am.txt: add an 'a', say what 'it' is, simplify a sentence It's nice to know that 'it' is git-am or the subject line. Whitespace implies characters so just remove characters. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:08:58 UTC |
| ae616de | Stephen Boyd | 04 May 2009, 06:25:35 UTC | completion: complete values for send-email Add completion for --confirm, --suppress-cc, and --smtp-encryption command line arguments. Add completion for aliasfiletype and confirm configuration variables. Since --smtp-ssl is deprecated, replace it with --smtp-encryption and the two options ssl and tls. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:05:37 UTC |
| 672c68c | Stephen Boyd | 04 May 2009, 06:25:34 UTC | completion: complete values for log.date Add raw to the date formats too. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:05:37 UTC |
| 9b82d63 | Stephen Boyd | 04 May 2009, 06:25:33 UTC | completion: complete values for help.format Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:05:37 UTC |
| 0aa62fd | Stephen Boyd | 04 May 2009, 06:25:32 UTC | completion: add {gui,diff,merge}tool, man, and pager config variables Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:05:36 UTC |
| 226b343 | Stephen Boyd | 04 May 2009, 06:25:31 UTC | completion: add missing configuration variables to _git_config() Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:05:36 UTC |
| 2c5b011 | Allan Caffee | 04 May 2009, 17:37:30 UTC | dir.c: Fix two minor grammatical errors in comments Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:04:16 UTC |
| e84dc6d | Robin H. Johnson | 05 May 2009, 18:16:14 UTC | git-svn: fix a sloppy Getopt::Long usage Getopt-Long v2.38 is much stricter about sloppy getopt usage. The trailing pipe causes git-svn testcases to fail for all of the --stdin argument calls. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2009, 05:02:39 UTC |
| 3536ae3 | Junio C Hamano | 03 May 2009, 23:46:34 UTC | Sync with GIT 1.6.2.5 | 03 May 2009, 23:55:38 UTC |
| a48f5d7 | Junio C Hamano | 03 May 2009, 23:14:58 UTC | GIT 1.6.2.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 May 2009, 23:54:14 UTC |
| 69fd60a | Junio C Hamano | 03 May 2009, 23:50:47 UTC | Merge branch 'np/maint-no-ofs-delta' into maint * np/maint-no-ofs-delta: honor repack.usedeltabaseoffset when fetching packs | 03 May 2009, 23:50:47 UTC |
| 00f97c7 | Junio C Hamano | 03 May 2009, 23:14:07 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: GIT 1.6.1.4 Conflicts: GIT-VERSION-GEN | 03 May 2009, 23:14:07 UTC |
| bab39ed | Junio C Hamano | 03 May 2009, 22:20:03 UTC | GIT 1.6.1.4 With a handful of fixes backmerged from 1.6.2.X series Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 May 2009, 22:29:31 UTC |
| d265ddc | Junio C Hamano | 03 May 2009, 22:02:59 UTC | Merge branch 'jc/maint-read-tree-multi' into maint * 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 | 03 May 2009, 22:02:59 UTC |
| c2eae0a | Junio C Hamano | 03 May 2009, 22:02:52 UTC | Merge branch 'mk/maint-apply-swap' into maint * 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 | 03 May 2009, 22:02:52 UTC |
| 00473fd | Junio C Hamano | 03 May 2009, 22:02:46 UTC | Merge branch 'mm/maint-add-p-quit' into maint * mm/maint-add-p-quit: git add -p: add missing "q" to patch prompt | 03 May 2009, 22:02:46 UTC |
| 7d71be2 | Junio C Hamano | 03 May 2009, 22:02:40 UTC | Merge branch 'lt/pack-object-memuse' into maint * lt/pack-object-memuse: show_object(): push path_name() call further down process_{tree,blob}: show objects without buffering | 03 May 2009, 22:02:40 UTC |
| e89c6ea | Junio C Hamano | 03 May 2009, 22:01:31 UTC | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 * jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws is_kept_pack(): final clean-up Simplify is_kept_pack() Consolidate ignore_packed logic more has_sha1_kept_pack(): take "struct rev_info" has_sha1_pack(): refactor "pretend these packs do not exist" interface git-repack: resist stray environment variable | 03 May 2009, 22:01:31 UTC |
| 3f3e2c2 | Junio C Hamano | 03 May 2009, 22:01:26 UTC | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 * jc/maint-1.6.0-diff-borrow-carefully: diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged | 03 May 2009, 22:01:26 UTC |
| 652f0c8 | Junio C Hamano | 03 May 2009, 22:01:19 UTC | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 * bs/maint-1.6.0-tree-walk-prefix: match_tree_entry(): a pathspec only matches at directory boundaries tree_entry_interesting: a pathspec only matches at directory boundary | 03 May 2009, 22:01:19 UTC |
| 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 |
| f04833e | Nicolas Pitre | 02 May 2009, 00:18:02 UTC | honor repack.usedeltabaseoffset when fetching packs If the local receiving repository has disabled the use of delta base offset, for example to retain compatibility with older versions of Git that predate OFS_DELTA, we shouldn't ask for ofs-delta support when we obtain a pack from the remote server. [ issue noticed by Shawn Pearce ] Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 May 2009, 05:13:43 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 |
