| 031e6c8 | Junio C Hamano | 21 October 2008, 20:37:42 UTC | GIT 1.6.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2008, 20:37:42 UTC |
| a672ea6 | Nicolas Pitre | 21 October 2008, 01:17:07 UTC | rehabilitate 'git index-pack' inside the object store Before commit d0b92a3f6e it was possible to run 'git index-pack' directly in the .git/objects/pack/ directory. Restore that ability. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2008, 20:20:03 UTC |
| 5610e3b | Junio C Hamano | 20 October 2008, 05:51:17 UTC | Fix testcase failure when extended attributes are in use 06cbe855 (Make core.sharedRepository more generic, 2008-04-16) made several testcases in t1301-shared-repo.sh which fail if on a system which creates files with extended attributes (e.g. SELinux), since ls appends a '+' sign to the permission set in such cases. In fact, POSIX.1 allows ls to add a single printable character after the usual 3x3 permission bits to show that an optional alternate/additional access method is associated with the path. This fixes the testcase to strip any such sign prior to verifying the permission set. Signed-off-by: Junio C Hamano <gitster@pobox.com> Tested-by: Deskin Miller <deskinm@umich.edu> | 20 October 2008, 05:51:17 UTC |
| 09cff06 | Abhijit Bhopatkar | 19 October 2008, 04:19:23 UTC | Documentation: Clarify '--signoff' for git-commit '--signoff' uses commiter name always to add the signoff line, make it explicit in the documentation. Signed-off-by: Abhijit Bhopatkar <bain@devslashzero.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2008, 05:19:52 UTC |
| f430c8e | Junio C Hamano | 18 October 2008, 15:26:39 UTC | Hopefully the final draft release notes update before 1.6.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2008, 15:26:39 UTC |
| f07c3c5 | Junio C Hamano | 18 October 2008, 15:20:51 UTC | diff(1): clarify what "T"ypechange status means Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2008, 15:20:51 UTC |
| a38bb0c | Junio C Hamano | 18 October 2008, 15:18:11 UTC | Merge branch 'db/maint-checkout-b' into maint * db/maint-checkout-b: Check early that a new branch is new and valid | 18 October 2008, 15:18:11 UTC |
| 3b1eb12 | Dan McGee | 18 October 2008, 02:41:18 UTC | contrib: update packinfo.pl to not use dashed commands Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2008, 13:20:27 UTC |
| 1fb23e6 | Björn Steinbrink | 18 October 2008, 00:37:31 UTC | force_object_loose: Fix memory leak read_packed_sha1 expectes its caller to free the buffer it returns, which force_object_loose didn't do. This leak is eventually triggered by "git gc", when it is manually invoked or there are too many packs around, making gc totally unusable when there are lots of unreachable objects. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2008, 13:19:06 UTC |
| 7213080 | Jeff King | 13 October 2008, 09:35:59 UTC | tests: shell negation portability fix Commit 969c8775 introduced a test which uses the non-portable construct: command1 && ! command2 | command3 which must be command1 && ! (command2 | command3) to work on bsd shells (this is another example of bbf08124, which fixed several similar cases). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2008, 18:30:54 UTC |
| 8ed0a74 | Matt McCutchen | 17 October 2008, 02:32:14 UTC | t1301-shared-repo.sh: don't let a default ACL interfere with the test This test creates files with several different umasks and expects their permissions to be initialized according to the umask, so a default ACL on the trash directory (which overrides the umask for files created in that directory) causes the test to fail. To avoid that, remove the default ACL if possible with setfacl(1). Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2008, 02:37:27 UTC |
| 5782566 | Jonas Fonseca | 15 October 2008, 07:10:58 UTC | git-check-attr(1): add output and example sections Plumbing tools should document what output can be expected. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2008, 15:40:25 UTC |
| 563d5a2 | Brandon Casey | 01 October 2008, 19:28:26 UTC | xdiff-interface.c: strip newline (and cr) from line before pattern matching POSIX doth sayeth: "In the regular expression processing described in IEEE Std 1003.1-2001, the <newline> is regarded as an ordinary character and both a period and a non-matching list can match one. ... Those utilities (like grep) that do not allow <newline>s to match are responsible for eliminating any <newline> from strings before matching against the RE." Thus far git has not been removing the trailing newline from strings matched against regular expression patterns. This has the effect that (quoting Jonathan del Strother) "... a line containing just 'FUNCNAME' (terminated by a newline) will be matched by the pattern '^(FUNCNAME.$)' but not '^(FUNCNAME$)'", and more simply not '^FUNCNAME$'. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 October 2008, 15:31:56 UTC |
| b19d288 | Brandon Casey | 16 October 2008, 00:58:50 UTC | t4018-diff-funcname: demonstrate end of line funcname matching flaw Since the newline is not removed from lines before pattern matching, a pattern cannot match to the end of the line using the '$' operator without using an additional operator which will indirectly match the '\n' character. Introduce a test which should pass, but which does not due to this flaw. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2008, 15:31:56 UTC |
| 16b2672 | Brandon Casey | 16 October 2008, 00:58:49 UTC | t4018-diff-funcname: rework negated last expression test This test used the non-zero exit status of 'git diff' to indicate that a negated funcname pattern, when placed last, was correctly rejected. The problem with this is that 'git diff' always returns non-zero if it finds differences in the files it is comparing, and the files must contain differences in order to trigger the funcname pattern codepath. Instead of checking for non-zero exit status, make sure the expected error message is printed. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2008, 15:31:56 UTC |
| 6c2a602 | Mikael Magnusson | 19 September 2008, 13:48:08 UTC | Typo "does not exists" when git remote update remote. | 16 October 2008, 15:20:15 UTC |
| c82efaf | Brandon Casey | 14 October 2008, 20:30:21 UTC | remote.c: correct the check for a leading '/' in a remote name This test is supposed to disallow remote entries in the config file of the form: [remote "/foobar"] ... The leading slash in '/foobar' is not acceptable. Instead it was incorrectly testing that the subkey had no leading '/', which had no effect since the subkey pointer was made to point at a '.' in the preceding lines. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 October 2008, 00:18:29 UTC |
| 4e6d4bc | Miklos Vajna | 13 October 2008, 20:54:25 UTC | Add testcase to ensure merging an early part of a branch is done properly Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 October 2008, 23:52:09 UTC |
| 6c16792 | Junio C Hamano | 13 October 2008, 22:41:36 UTC | Update draft release notes to 1.6.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 October 2008, 22:41:36 UTC |
| 72d404d | Shawn O. Pearce | 12 October 2008, 20:13:59 UTC | test-lib: fix broken printf b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of printf without a format string. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2008, 20:13:59 UTC |
| 969c877 | Jeff King | 12 October 2008, 04:06:11 UTC | git apply --directory broken for new files We carefully verify that the input to git-apply is sane, including cross-checking that the filenames we see in "+++" headers match what was provided on the command line of "diff --git". When --directory is used, however, we ended up comparing the unadorned name to one with the prepended root, causing us to complain about a mismatch. We simply need to prepend the root directory, if any, when pulling the name out of the git header. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2008, 18:09:41 UTC |
| ff74126 | Johannes Schindelin | 10 October 2008, 11:42:12 UTC | rebase -i: do not fail when there is no commit to cherry-pick In case there is no commit to apply (for example because you rebase to upstream and all your local patches have been applied there), do not fail. The non-interactive rebase already behaves that way. Do this by introducing a new command, "noop", which is substituted for an empty commit list, so that deleting the commit list can still abort as before. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 15:32:03 UTC |
| b8eecaf | Miklos Vajna | 09 October 2008, 22:07:10 UTC | test-lib: fix color reset in say_color() When executing a single test with colors enabled, the cursor was not set back to the previous one, and you had to hit an extra enter to get it back. Work around this problem by calling 'tput sgr0' before printing the final newline. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 15:01:40 UTC |
| 838cd34 | Nicolas Pitre | 10 October 2008, 02:08:51 UTC | fix pread()'s short read in index-pack Since v1.6.0.2~13^2~ the completion of a thin pack uses sha1write() for its ability to compute a SHA1 on the written data. This also provides data buffering which, along with commit 92392b4a45, will confuse pread() whenever an appended object is 1) freed due to memory pressure because of the depth-first delta processing, and 2) needed again because it has many delta children, and 3) its data is still buffered by sha1write(). Let's fix the issue by simply forcing cached data out when such an object is written so it can be pread()'d at leisure. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2008, 14:09:30 UTC |
| 44c33a5 | Shawn O. Pearce | 09 October 2008, 16:33:23 UTC | Merge branch 'sg/maint-intrebase-msghook' into maint * sg/maint-intrebase-msghook: rebase -i: remove leftover debugging rebase -i: proper prepare-commit-msg hook argument when squashing | 09 October 2008, 16:33:23 UTC |
| b8ebe08 | Imre Deak | 08 October 2008, 21:24:16 UTC | builtin-apply: fix typo leading to stack corruption This typo led to stack corruption for lines with whitespace fixes and length > 1024. Signed-off-by: Imre Deak <imre.deak@gmail.com> Looks-good-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 October 2008, 16:21:50 UTC |
| 875471c | Brandon Casey | 02 October 2008, 23:52:11 UTC | git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1) The referenced commit tried to fix a flaw in stash's handling of a user supplied invalid ref. i.e. 'git stash apply fake_ref@{0}' should fail instead of applying stash@{0}. But, it did so in a naive way by avoiding the use of the --default option of rev-parse, and instead manually supplied the default revision if the user supplied an empty command line. This prevented a common usage scenario of supplying flags on the stash command line (i.e. non-empty command line) which would be parsed by lower level git commands, without supplying a specific revision. This should fall back to the default revision, but now it causes an error. e.g. 'git stash show -p' The correct fix is to use the --verify option of rev-parse, which fails properly if an invalid ref is supplied, and still allows falling back to a default ref when one is not supplied. Convert stash-drop to use --verify while we're at it, since specifying multiple revisions for any of these commands is also an error and --verify makes it so. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 October 2008, 16:09:50 UTC |
| 027b5a4 | Shawn O. Pearce | 09 October 2008, 16:08:43 UTC | Merge branch 'jk/maint-soliconv' into maint * jk/maint-soliconv: Makefile: do not set NEEDS_LIBICONV for Solaris 8 | 09 October 2008, 16:08:43 UTC |
| 36e4053 | Brandon Casey | 09 October 2008, 00:07:54 UTC | builtin-merge.c: allocate correct amount of memory Fix two memory allocation errors which allocate space for a pointer rather than enough space for the structure itself. This: struct commit_list *parent = xmalloc(sizeof(struct commit_list *)); should have been this: struct commit_list *parent = xmalloc(sizeof(struct commit_list)); But while we're at it, change the allocation to reference the variable it is allocating memory for to try to prevent a similar mistake, for example if the type is changed, in the future. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 October 2008, 15:13:29 UTC |
| fb74243 | Samuel Tardieu | 06 October 2008, 17:28:41 UTC | Do not use errno when pread() returns 0 If we use pread() while at the end of the file, it will return 0, which is not an error from the operating system point of view. In this case, errno has not been set and must not be used. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 October 2008, 14:38:48 UTC |
| 0a2c7ee | Deskin Miller | 07 October 2008, 05:37:48 UTC | git init: --bare/--shared overrides system/global config If core.bare or core.sharedRepository are set in /etc/gitconfig or ~/.gitconfig, then 'git init' will read the values when constructing a new config file; reading them, however, will override the values specified on the command line. In the case of --bare, this ends up causing a segfault, without the repository being properly initialised; in the case of --shared, the permissions are set according to the existing config settings, not what was specified on the command line. This fix saves any specified values for --bare and --shared prior to reading existing config settings, and restores them after reading but before writing the new config file. core.bare is ignored in all situations, while core.sharedRepository will only be used if --shared is not specified to git init. Also includes testcases which use a specified global config file override, demonstrating the former failure scenario. Signed-off-by: Deskin Miller <deskinm@umich.edu> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 October 2008, 14:18:44 UTC |
| bf07cc5 | Johannes Sixt | 07 October 2008, 14:26:20 UTC | git-push.txt: Describe --repo option in more detail The --repo option was described in a way that the reader would have to assume that it is the same as the <repository> parameter. But it actually servers a purpose, which is now written down. Furthermore, the --mirror option was missing from the synopsis. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 October 2008, 14:15:53 UTC |
| cced48a | Johannes Schindelin | 07 October 2008, 16:08:21 UTC | git rm: refresh index before up-to-date check Since "git rm" is supposed to be porcelain, we should convince it to be user friendly by refreshing the index itself. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 October 2008, 14:04:44 UTC |
| daf6c2e | Mikael Magnusson | 07 October 2008, 18:15:25 UTC | Fix a few typos in relnotes Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 October 2008, 18:26:56 UTC |
| e261cf9 | Shawn O. Pearce | 06 October 2008, 15:22:19 UTC | Update release notes for 1.6.0.3 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 15:55:00 UTC |
| d70b4a8 | Nanako Shiraishi | 06 October 2008, 05:14:24 UTC | Teach rebase -i to honor pre-rebase hook The original git-rebase honored pre-rebase hook so that public branches can be protected from getting rebased, but rebase --interactive ignored the hook entirely. This fixes it. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 08:19:14 UTC |
| 00e5d48 | Nanako Shiraishi | 05 October 2008, 13:26:54 UTC | docs: describe pre-rebase hook Documentation/git-rebase.txt talks about pre-rebase hook, but it appears that Documentation/git-hooks.txt does not have corresponding entry for it. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 08:17:05 UTC |
| d09e2cd | Dmitry Potapov | 05 October 2008, 02:14:40 UTC | do not segfault if make_cache_entry failed Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 07:49:57 UTC |
| 62525ef | Dmitry Potapov | 05 October 2008, 00:40:36 UTC | make prefix_path() never return NULL There are 9 places where prefix_path is called, and only in one of them the returned pointer was checked to be non-zero and only to call exit(128) as it is usually done by die(). In other 8 places, the returned value was not checked and it caused SIGSEGV when a path outside of the working tree was used. For instance, running git update-index --add /some/path/outside caused SIGSEGV. This patch changes prefix_path() to die if the path is outside of the repository, so it never returns NULL. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 07:37:30 UTC |
| 71b989e | Linus Torvalds | 05 October 2008, 19:35:15 UTC | fix bogus "diff --git" header from "diff --no-index" When "git diff --no-index" is given an absolute pathname, it would generate a diff header with the absolute path prepended by the prefix, like: diff --git a/dev/null b/foo Not only is this nonsensical, and not only does it violate the description of diffs given in git-diff(1), but it would produce broken binary diffs. Unlike text diffs, the binary diffs don't contain the filenames anywhere else, and so "git apply" relies on this header to figure out the filename. This patch just refuses to use an invalid name for anything visible in the diff. Now, this fixes the "git diff --no-index --binary a /dev/null" kind of case (and we'll end up using "a" as the basename), but some other insane cases are impossible to handle. If you do git diff --no-index --binary a /bin/echo you'll still get a patch like diff --git a/a b/bin/echo old mode 100644 new mode 100755 index ... and "git apply" will refuse to apply it for a couple of reasons, and the diff is simply bogus. And that, btw, is no longer a bug, I think. It's impossible to know whethe the user meant for the patch to be a rename or not. And as such, refusing to apply it because you don't know what name you should use is probably _exactly_ the right thing to do! Original problem reported by Imre Deak. Test script and problem description by Jeff King. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 07:29:28 UTC |
| fe8aa14 | Tuncer Ayaz | 05 October 2008, 13:53:00 UTC | Fix fetch/clone --quiet when stdout is connected Fixes the `git clone --quiet` issue raised by Dave Jones in http://marc.info/?l=git&m=121529226023180&w=2 With this simple patch applied we no longer see the following remote messages as no-progress is correctly sent to the remote site: remote: Counting objects: 84102, done. remote: Compressing objects: 100% (24720/24720), done. remote: Total 84102 (delta 60949), reused 80810 (delta 57900) Signed-off-by: Tuncer Ayaz <tuncer.ayaz@gmail.com> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 07:01:07 UTC |
| 5209ac4 | Alexander Gavrilov | 03 October 2008, 16:23:50 UTC | builtin-blame: Fix blame -C -C with submodules. When performing copy detection, git-blame tries to read gitlinks as blobs, which causes it to die. This patch adds a check to skip them. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 06:49:55 UTC |
| 5a625b0 | SZEDER Gábor | 03 October 2008, 19:34:49 UTC | bash: remove fetch, push, pull dashed form leftovers We don't provide complation for git-commands in dashed form anymore, so there is no need to keep those cases. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Tested-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 06 October 2008, 06:48:43 UTC |
| 0e214af | Jeff King | 03 October 2008, 06:39:36 UTC | Makefile: do not set NEEDS_LIBICONV for Solaris 8 This breaks my build on Solaris 8, as there is no separate libiconv. The history of this line is somewhat convoluted. In 2fd955c (in November 2005), NEEDS_LIBICONV was turned on for all Solaris builds, claiming to "fix an error in Solaris 10 by setting NEEDS_LIBICONV". Later, e15f545 (in February of 2006) claimed that "Solaris 9+ don't need iconv", and moved NEEDS_LIBICONV into a section for Solaris 8. Furthermore, Brandon Casey claims in <5A1KxlhmUIHe8iXPxnXYuNXsq0Yjlbwkz2eBin3z7ELuL9nK-4tSpw@cipher.nrlssc.navy.mil> that he does not set NEEDS_LIBICONV for Solaris 7. So either one of those commits is totally wrong, or there is some other magic going on where some Solaris installs need it and others don't. Given Brandon's statement and my problems on Solaris 8 with NEEDS_LIBICONV, I am inclined to think the first commit was bogus, and that NEEDS_LIBICONV shouldn't be set for Solaris at all by default. If somebody wants to use iconv and has installed it manually, they can set it in their config.mak. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2008, 14:51:54 UTC |
| 943cea9 | SZEDER Gábor | 03 October 2008, 09:33:20 UTC | rebase -i: remove leftover debugging Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2008, 14:43:28 UTC |
| 7c41883 | SZEDER Gábor | 03 October 2008, 00:08:21 UTC | rebase -i: proper prepare-commit-msg hook argument when squashing One would expect that the prepare-commit-msg hook gets 'squash' as the second argument when squashing commits with 'rebase -i'. However, that was not the case, as it got 'merge' instead. This patch fixes the problem. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2008, 02:23:55 UTC |
| 9a1fd65 | Jakub Narebski | 02 October 2008, 14:52:20 UTC | gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh Note that those tests only check that there are no errors nor warnings from Perl; they do not check for example if gitweb doesn't use ARRAY(0x8e3cc20) instead of correct value in links, etc. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2008, 00:44:09 UTC |
| 2d7a353 | Jakub Narebski | 02 October 2008, 14:50:04 UTC | gitweb: Fix two 'uninitialized value' warnings in git_tree() If we did try to access nonexistent directory or file, which means that git_get_hash_by_path() returns `undef`, uninitialized $hash variable was passed to 'open' call. Now we fail early with "404 Not Found - No such tree" error. (If we try to access something which does not resolve to tree-ish, for example a file / 'blob' object, the error will be caught later, as "404 Not Found - Reading tree failed" error). If we tried to use 'tree' action without $file_name ('f' parameter) set, which means either tree given by hash or a top tree (and we currently cannot distinguish between those two cases), we cannot print path breadcrumbs with git_print_page_path(). Fix this by moving call to git_print_page_path() inside conditional. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2008, 00:43:18 UTC |
| 6e2dfb1 | David Soria Parra | 02 October 2008, 00:08:47 UTC | Solaris: Use OLD_ICONV to avoid compile warnings Solaris systems use the old styled iconv(3) call and therefore the OLD_ICONV variable should be set. Otherwise we get annoying compile warnings. Signed-off-by: David Soria Parra <dsp@php.net> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2008, 00:27:31 UTC |
| b65910f | Giuseppe Bilotta | 29 September 2008, 13:07:42 UTC | gitweb: remove PATH_INFO from $my_url and $my_uri This patch fixes PATH_INFO handling by removing the relevant part from $my_url and $my_uri, thus making it unnecessary to specify them by hand in the gitweb configuration. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2008, 00:27:10 UTC |
| b1524ee | martin f. krafft | 30 September 2008, 19:57:50 UTC | Improve git-log documentation wrt file filters The need for "--" in the git-log synopsis was previously unclear and confusing. This patch makes it a little clearer. Thanks to hyy <yiyihu@gmail.com> for his help. [sp: Changed -- to \-- per prior commit e1ccf53.] Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 October 2008, 15:21:22 UTC |
| 5d6b3a9 | SZEDER Gábor | 30 September 2008, 17:27:10 UTC | Documentation: remove '\' in front of short options ... because they show up in the man and html outputs. This escaping is only needed for double dashes to be compatible with older asciidoc versions; see commit e1ccf53 ([PATCH] Escape asciidoc's built-in em-dash replacement, 2005-09-12). Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 October 2008, 15:18:46 UTC |
| 0a1a1c8 | Luc Heinrich | 29 September 2008, 13:58:18 UTC | git-svn: call 'fatal' correctly in set-tree When doing a set-tree and there is no revision to commit to, the following unrelated error message is displayed: "Undefined subroutine &Git::SVN::fatal called at /opt/local/libexec/git-core/git-svn line 2575." The following patch fixes the problem and allows the real error message to be shown. Signed-off-by: Luc Heinrich <luc@honk-honk.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 20:58:59 UTC |
| 2670ddc | Michael Prokop | 29 September 2008, 23:01:34 UTC | Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606) foo.org is an existing domain, use RFC 2606 complying example.com instead as used in other docs as well. Signed-off-by: Michael Prokop <mika@grml.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 20:57:47 UTC |
| 4b3729e | SZEDER Gábor | 30 September 2008, 13:32:47 UTC | t0024: add executable permission Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 September 2008, 19:16:59 UTC |
| edb7e82 | Shawn O. Pearce | 29 September 2008, 17:23:19 UTC | Merge branch 'bc/maint-diff-hunk-header-fix' into maint * bc/maint-diff-hunk-header-fix: t4018-diff-funcname: test syntax of builtin xfuncname patterns diff hunk pattern: fix misconverted "\{" tex macro introducers diff: use extended regexp to find hunk headers diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Conflicts: Documentation/gitattributes.txt | 29 September 2008, 17:23:19 UTC |
| e9a06f1 | Shawn O. Pearce | 29 September 2008, 16:39:53 UTC | Merge branch 'mg/maint-remote-fix' into maint * mg/maint-remote-fix: make "git remote" report multiple URLs | 29 September 2008, 16:39:53 UTC |
| cbce6c0 | Rafael Garcia-Suarez | 29 September 2008, 16:04:41 UTC | Clarify commit error message for unmerged files Currently, trying to use git-commit with unmerged files in the index will show the message "Error building trees", which can be a bit obscure to the end user. This patch makes the error message clearer, and consistent with what git-write-tree reports in a similar situation. Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2008, 16:13:20 UTC |
| 94e02e7 | Johan Herland | 27 September 2008, 22:24:36 UTC | Use strchrnul() instead of strchr() plus manual workaround Also gets rid of a C++ comment. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2008, 15:56:26 UTC |
| 175a494 | Alex Riesen | 26 September 2008, 22:59:14 UTC | Use remove_path from dir.c instead of own implementation Besides, it fixes a memleak (builtin-rm.c) and accidental change of the input const argument (builtin-merge-recursive.c). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2008, 15:37:07 UTC |
| 4a92d1b | Alex Riesen | 26 September 2008, 22:56:46 UTC | Add remove_path: a function to remove as much as possible of a path The function has two potential users which both managed to get wrong their implementations (the one in builtin-rm.c one has a memleak, and builtin-merge-recursive.c scribles over its const argument). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2008, 15:37:07 UTC |
| b9b378a | Ping Yin | 26 September 2008, 15:33:23 UTC | git-submodule: Fix "Unable to checkout" for the initial 'update' Since commit 55218("checkout: do not lose staged removal"), in cmd_add/cmd_update, "git checkout <commit>" following "git clone -n" may fail if <commit> is different from HEAD. So Use "git checkout -f <commit>" to fix this. Signed-off-by: Ping Yin <pkufranky@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2008, 15:24:19 UTC |
| 2a79d2f | Stephen Haberman | 29 September 2008, 09:12:04 UTC | Clarify how the user can satisfy stash's 'dirty state' check. Signed-off-by: Stephen Haberman <stephen@exigencecorp.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2008, 15:13:10 UTC |
| 41f13af | Alex Riesen | 25 September 2008, 20:12:45 UTC | Remove empty directories in recursive merge The code was actually supposed to do that, but was accidentally broken. Noticed by Anders Melchiorsen. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2008, 15:05:20 UTC |
| fee7545 | Chris Frey | 24 September 2008, 23:21:28 UTC | Documentation: clarify the details of overriding LESS via core.pager The process of overriding the default LESS options using only git-specific methods is rather obscure. Show the end user how to do it in a step-by-step manner. Signed-off-by: Chris Frey <cdfrey@foursquare.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2008, 14:55:30 UTC |
| 93feb4b | Shawn O. Pearce | 25 September 2008, 15:27:41 UTC | Update release notes for 1.6.0.3 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2008, 15:27:41 UTC |
| 7fe4a72 | Jonas Fonseca | 25 September 2008, 08:35:38 UTC | checkout: Do not show local changes when in quiet mode Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2008, 14:46:59 UTC |
| 85cf643 | Johan Herland | 24 September 2008, 23:10:54 UTC | for-each-ref: Fix --format=%(subject) for log message without newlines 'git for-each-ref --format=%(subject)' currently returns an empty string if the log message does not contain a newline. This patch teaches 'git for-each-ref' to return the entire log message (instead of an empty string) if there is no newline in the log message. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2008, 00:02:05 UTC |
| da65e7c | Brandon Casey | 23 September 2008, 23:57:09 UTC | git-stash.sh: don't default to refs/stash if invalid ref supplied apply_stash() and show_stash() each call rev-parse with '--default refs/stash' as an argument. This option causes rev-parse to operate on refs/stash if it is not able to successfully operate on any element of the command line. This includes failure to supply a "valid" revision. This has the effect of causing 'stash apply' and 'stash show' to operate as if stash@{0} had been supplied when an invalid revision is supplied. e.g. 'git stash apply stash@{1}' would fall back to 'git stash apply stash@{0}' This patch modifies these two functions so that they avoid using the --default option of rev-parse. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 16:24:20 UTC |
| dc4179f | Deskin Miller | 22 September 2008, 15:06:41 UTC | maint: check return of split_cmdline to avoid bad config strings As the testcase demonstrates, it's possible for split_cmdline to return -1 and deallocate any memory it's allocated, if the config string is missing an end quote. In both the cases below, which are the only calling sites, the return isn't checked, and using the pointer causes a pretty immediate segfault. Signed-off-by: Deskin Miller <deskinm@umich.edu> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2008, 15:58:14 UTC |
| db87e39 | Brandon Casey | 22 September 2008, 23:34:26 UTC | builtin-prune.c: prune temporary packs in <object_dir>/pack directory Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2008, 08:53:07 UTC |
| e3bf5e4 | Brandon Casey | 22 September 2008, 23:19:05 UTC | t4018-diff-funcname: test syntax of builtin xfuncname patterns Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2008, 02:59:23 UTC |
| 8b4eb6b | Petr Baudis | 22 September 2008, 17:20:21 UTC | Do not perform cross-directory renames when creating packs A comment on top of create_tmpfile() describes caveats ('can have problems on various systems (FAT, NFS, Coda)') that should apply in this situation as well. This in the end did not end up solving any of my personal problems, but it might be a useful cleanup patch nevertheless. Signed-off-by: Petr Baudis <pasky@suse.cz> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2008, 19:19:14 UTC |
| 18309f4 | Todd Zullinger | 22 September 2008, 11:30:08 UTC | Use dashless git commands in setgitperms.perl Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2008, 16:36:12 UTC |
| 79bbc7f | Johannes Sixt | 22 September 2008, 11:03:25 UTC | git-remote: do not use user input in a printf format string 'git remote show' substituted the remote name into a string that was later used as a printf format string. If a remote name contains a printf format specifier like this: $ git remote add foo%sbar . then the command $ git remote show foo%sbar would print garbage (if you are lucky) or crash. This fixes it. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2008, 16:35:58 UTC |
| 7d20e21 | Michael J Gruber | 22 September 2008, 08:57:51 UTC | make "git remote" report multiple URLs This patch makes "git remote -v" and "git remote show" report multiple URLs rather than warn about them. Multiple URLs are OK for pushing into multiple repos simultaneously. Without "-v" each repo is shown once only. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2008, 16:29:37 UTC |
| 352eadc | Daniel Barkalow | 21 September 2008, 18:36:06 UTC | Check early that a new branch is new and valid If you fail to update refs to change branches in checkout, your index and working tree are left already updated. We don't have an easy way to undo this, but at least we can check things that would make the creation of a new branch fail. These checks were in the shell version, and were lost in the C conversion. The messages are from the shell version, and should probably be made nicer. [jc: added test to t7201] Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2008, 06:17:06 UTC |
| 96d1a8e | Junio C Hamano | 20 September 2008, 22:30:12 UTC | diff hunk pattern: fix misconverted "\{" tex macro introducers Pointed out by Brandon Casey. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 22:30:17 UTC |
| 6a6baf9 | Junio C Hamano | 20 September 2008, 06:45:04 UTC | diff: use extended regexp to find hunk headers Using ERE elements such as "|" (alternation) by backquoting in BRE is a GNU extension and should not be done in portable programs. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 06:45:04 UTC |
| cc185a6 | Junio C Hamano | 20 September 2008, 06:15:13 UTC | Start draft release notes for 1.6.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 06:15:13 UTC |
| 8d11fde | Mikael Magnusson | 19 September 2008, 13:43:48 UTC | git-repack uses --no-repack-object, not --no-repack-delta. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 05:23:14 UTC |
| 597faa0 | Mikael Magnusson | 19 September 2008, 13:42:30 UTC | Typo "bogos" in format-patch error message. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 05:05:42 UTC |
| 02ed245 | Fabrizio Chiarello | 19 September 2008, 12:07:26 UTC | builtin-clone: fix typo Signed-off-by: Fabrizio Chiarello <ponch@autistici.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 05:05:31 UTC |
| 264e0b9 | Yann Dirson | 19 September 2008, 20:12:53 UTC | Bust the ghost of long-defunct diffcore-pathspec. This concept was retired by 77882f6 (Retire diffcore-pathspec., 2006-04-10), more than 2 years ago. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 02:48:30 UTC |
| aa5735b | Eric Raible | 11 September 2008, 00:40:20 UTC | completion: git commit should list --interactive Signed-off-by: Eric Raible <raible@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2008, 02:47:36 UTC |
| 45d9414 | Brandon Casey | 18 September 2008, 22:44:33 UTC | diff.*.xfuncname which uses "extended" regex's for hunk header selection Currently, the hunk headers produced by 'diff -p' are customizable by setting the diff.*.funcname option in the config file. The 'funcname' option takes a basic regular expression. This functionality was designed using the GNU regex library which, by default, allows using backslashed versions of some extended regular expression operators, even in Basic Regular Expression mode. For example, the following characters, when backslashed, are interpreted according to the extended regular expression rules: ?, +, and |. As such, the builtin funcname patterns were created using some extended regular expression operators. Other platforms which adhere more strictly to the POSIX spec do not interpret the backslashed extended RE operators in Basic Regular Expression mode. This causes the pattern matching for the builtin funcname patterns to fail on those platforms. Introduce a new option 'xfuncname' which uses extended regular expressions, and advertise it _instead_ of funcname. Since most users are on GNU platforms, the majority of funcname patterns are created and tested there. Advertising only xfuncname should help to avoid the creation of non-portable patterns which work with GNU regex but not elsewhere. Additionally, the extended regular expressions may be less ugly and complicated compared to the basic RE since many common special operators do not need to be backslashed. For example, the GNU Basic RE: ^[ ]*\\(\\(public\\|static\\).*\\)$ becomes the following Extended RE: ^[ ]*((public|static).*)$ Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 03:06:31 UTC |
| a013585 | Brandon Casey | 18 September 2008, 22:42:48 UTC | diff.c: associate a flag with each pattern and use it for compiling regex This is in preparation for allowing extended regular expression patterns. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 03:06:23 UTC |
| 45e7ca0 | Brandon Casey | 18 September 2008, 22:40:48 UTC | diff.c: return pattern entry pointer rather than just the hunk header pattern This is in preparation for associating a flag with each pattern which will control how the pattern is interpreted. For example, as a basic or extended regular expression. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 02:58:29 UTC |
| ea2408b | Junio C Hamano | 19 September 2008, 02:53:25 UTC | Merge branch 'dp/maint-rebase-fix' into maint * dp/maint-rebase-fix: git-rebase--interactive: auto amend only edited commit git-rebase-interactive: do not squash commits on abort | 19 September 2008, 02:53:25 UTC |
| 2ba3d5d | Junio C Hamano | 19 September 2008, 02:53:22 UTC | Merge branch 'jc/maint-checkout-keep-remove' into maint * jc/maint-checkout-keep-remove: checkout: do not lose staged removal | 19 September 2008, 02:53:22 UTC |
| 01409bb | Junio C Hamano | 19 September 2008, 02:53:12 UTC | Merge branch 'jc/maint-diff-quiet' into maint * jc/maint-diff-quiet: diff --quiet: make it synonym to --exit-code >/dev/null diff Porcelain: do not disable auto index refreshing on -C -C | 19 September 2008, 02:53:12 UTC |
| a3fcc05 | Junio C Hamano | 19 September 2008, 02:53:06 UTC | Merge branch 'jc/maint-name-hash-clear' into maint * jc/maint-name-hash-clear: discard_cache: reset lazy name_hash bit | 19 September 2008, 02:53:06 UTC |
| f99b1d2 | Junio C Hamano | 19 September 2008, 02:53:01 UTC | Merge branch 'jc/maint-template-permbits' into maint * jc/maint-template-permbits: Fix permission bits on sources checked out with an overtight umask | 19 September 2008, 02:53:01 UTC |
| 6380d12 | Junio C Hamano | 19 September 2008, 02:52:57 UTC | Merge branch 'mh/maint-honor-no-ssl-verify' into maint * mh/maint-honor-no-ssl-verify: Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set | 19 September 2008, 02:52:57 UTC |
| e32c0a9 | Thomas Rast | 18 September 2008, 22:24:46 UTC | sha1_file: link() returns -1 on failure, not errno 5723fe7 (Avoid cross-directory renames and linking on object creation, 2008-06-14) changed the call to use link() directly instead of through a custom wrapper, but forgot that it returns 0 or -1, not 0 or errno. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 02:51:13 UTC |
| b99b5b4 | Charles Bailey | 18 September 2008, 20:01:20 UTC | Make git archive respect core.autocrlf when creating zip format archives There is currently no call to git_config at the start of cmd_archive. When creating tar archives the core config is read as a side-effect of reading the tar specific config, but this doesn't happen for zip archives. The consequence is that in a configuration with core.autocrlf set, although files in a tar archive are created with crlf line endings, files in a zip archive retain unix line endings. Signed-off-by: Charles Bailey <charles@hashpling.org> Acked-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 02:49:28 UTC |
| f1265cc | Charles Bailey | 18 September 2008, 20:01:13 UTC | Add new test to demonstrate git archive core.autocrlf inconsistency Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 02:49:06 UTC |
| 53c3967 | Joey Hess | 05 September 2008, 18:26:29 UTC | gitweb: avoid warnings for commits without body In the unusual case when there is no commit message, gitweb would output an uninitialized value warning. Signed-off-by: Joey Hess <joey@kitenet.net> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 02:48:19 UTC |
| c882c01 | Garry Dolley | 17 September 2008, 06:20:39 UTC | Clarified gitattributes documentation regarding custom hunk header. The only part of the hunk header that we can change is the "TEXT" portion. Additionally, a few grammatical errors have been corrected. Signed-off-by: Garry Dolley <gdolley@ucla.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2008, 02:44:47 UTC |
| 61aeeef | Eric Wong | 07 September 2008, 03:18:18 UTC | git-svn: fix handling of even funkier branch names Apparently do_switch() tolerates the lack of escaping in less funky branch names. For the really strange and scary ones, we need to escape them properly. It strangely maintains compatible with the existing handling of branch names with spaces and exclamation marks. Reported-by: m.skoric@web.de ($gmane/94677) Signed-off-by: Eric Wong <normalperson@yhbt.net> | 19 September 2008, 02:27:16 UTC |
