| e42251a | Alex Riesen | 28 April 2008, 21:09:55 UTC | Use "=" instead of "==" in condition as it is more portable At least the dash from Ubuntu's /bin/sh says: test: 233: ==: unexpected operator Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 22:03:28 UTC |
| a2b26ac | Junio C Hamano | 23 April 2008, 17:53:47 UTC | clone: detect and fail on excess parameters "git clone [options] $src $dst excess-garbage" simply ignored excess-garbage without giving any diagnostic message. Fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 04:47:39 UTC |
| 5736a37 | Junio C Hamano | 28 April 2008, 04:47:38 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Remove 'header' from --signoff option description | 28 April 2008, 04:47:38 UTC |
| 362b0dd | Dan McGee | 27 April 2008, 00:43:20 UTC | Remove 'header' from --signoff option description Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 04:46:51 UTC |
| 1ce89cc | Jeff King | 22 April 2008, 11:11:13 UTC | remote: create fetch config lines with '+' Since git-remote always uses remote tracking branches, it should be safe to always force updates of those branches. I.e., we should generate fetch = +refs/heads/*:refs/remotes/$remote/* instead of fetch = refs/heads/*:refs/remotes/$remote/* This was the behavior of the perl version, which seems to have been lost in the C rewrite. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 05:30:31 UTC |
| f8aae12 | Jeff King | 23 April 2008, 09:16:06 UTC | push: allow unqualified dest refspecs to DWIM Previously, a push like: git push remote src:dst would go through the following steps: 1. check for an unambiguous 'dst' on the remote; if it exists, then push to that ref 2. otherwise, check if 'dst' begins with 'refs/'; if it does, create a new ref 3. otherwise, complain because we don't know where in the refs hierarchy to put 'dst' However, in some cases, we can guess about the ref type of 'dst' based on the ref type of 'src'. Specifically, before complaining we now check: 2.5. if 'src' resolves to a ref starting with refs/heads or refs/tags, then prepend that to 'dst' So now this creates a new branch on the remote, whereas it previously failed with an error message: git push master:newbranch Note that, by design, we limit this DWIM behavior only to source refs which resolve exactly (including symrefs which resolve to existing refs). We still complain on a partial destination refspec if the source is a raw sha1, or a ref expression such as 'master~10'. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 05:13:24 UTC |
| 31c6390 | Junio C Hamano | 25 April 2008, 04:50:48 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: t5516: remove ambiguity test (1) Linked glossary from cvs-migration page write-tree: properly detect failure to write tree objects | 25 April 2008, 04:50:48 UTC |
| 3ffb58b | Jeff King | 24 April 2008, 01:28:36 UTC | doc/git-gc: add a note about what is collected It seems to be a FAQ that people try running git-gc, and then get puzzled about why the size of their .git directory didn't change. This note mentions the reasons why things might unexpectedly get kept. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 04:50:19 UTC |
| 3ef6a1f | Jeff King | 23 April 2008, 09:21:45 UTC | t5516: remove ambiguity test (1) This test tried to push into a remote with ambiguous refs in remotes/$x/master and remotes/$y/master. However, the remote never actually tells us about the refs/remotes hierarchy, so we don't even see this ambiguity. The test happened to pass because we were simply looking for failure, and the test fails for another reason: the dst refspec does not exist and does not begin with refs/, making it invalid. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:56:07 UTC |
| 837f3b7 | Matt Graham | 23 April 2008, 13:13:51 UTC | Linked glossary from cvs-migration page Coming from CVS, I found the git glossary vital to learning git and learning how terms in git correlate to the cvs terminology with which I am familiar. This patch links the glossary from the cvs-migration page so cvs users will be able to fine the glossary as soon as they start looking at git documents. Signed-off-by: Matt Graham <mdg149@gmail.com> Acked-by: J. Bruce Fields <bfields@fieldses.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:54:43 UTC |
| edae5f0 | Junio C Hamano | 23 April 2008, 16:47:17 UTC | write-tree: properly detect failure to write tree objects Tomasz Fortuna reported that "git commit" does not error out properly when it cannot write tree objects out. "git write-tree" shares the same issue, as the failure to notice the error is deep in the logic to write tree objects out recursively. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:02:44 UTC |
| d6958a1 | Junio C Hamano | 23 April 2008, 06:37:06 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: svn-git: Use binmode for reading/writing binary rev maps diff options documentation: refer to --diff-filter in --name-status git-svn bug with blank commits and author file archive.c: format_subst - fixed bogus argument to memchr copy.c: copy_fd - correctly report write errors gitattributes: Fix subdirectory attributes specified from root directory | 23 April 2008, 06:37:06 UTC |
| 491b1b1 | Sam Vilain | 21 April 2008, 03:31:24 UTC | Amend git-push refspec documentation These paragraphs are a little confusing. Also, make it clearer when you have to specify the full name for <dst> Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 06:01:48 UTC |
| 208641c | Dmitry Potapov | 14 April 2008, 12:17:31 UTC | git-gc --prune is deprecated 25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 made the '--prune' option deprecated and removed its description from the git-gc man page. This patch removes all references to this option from the rest of the Git documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:53:37 UTC |
| 4f7ec79 | Michael Weber | 18 April 2008, 13:12:04 UTC | svn-git: Use binmode for reading/writing binary rev maps Otherwise, there is a possible interaction with UTF-8 locales in combination with PERL_UNICODE, resulting in "inconsistent size: 40" or "read:"-type errors. See also: perldoc -f binmode <http://perldoc.perl.org/perl581delta.html#UTF-8-no-longer-default-under-UTF-8-locales> Signed-off-by: Michael Weber <michaelw@foldr.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:43:58 UTC |
| a6f47b2 | Miklos Vajna | 22 April 2008, 12:23:48 UTC | diff options documentation: refer to --diff-filter in --name-status git diff --name-status outputs letters, but the meaning of those letters is documented elsewhere. Add a note to make the manpage more intuitive. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:42:38 UTC |
| 34b5cd1 | Jeff King | 22 April 2008, 10:41:47 UTC | Don't force imap.host to be set when imap.tunnel is set The documentation for git-imap-send suggests a tunnel setting such as Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null" which works wonderfully and doesn't require a username, password or port setting. However, git-imap-send currently requires that the imap.host variable be set in the config even when it was unused. This patch changes imap-send to only require that the imap.host setting is set if imap.tunnel is not set. Otherwise, server.host is set to "tunnel" for reporting purposes. Acked-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:42:23 UTC |
| 2498a1a | Brandon Casey | 03 April 2008, 18:26:13 UTC | git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc Since git-gc now always calls prune, even with --auto, unreferenced objects may be removed by more operations than just git-gc. This is important for clones created using --shared or --reference. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:40:44 UTC |
| 9231f50 | Thomas Guyot-Sionnest | 22 April 2008, 10:07:47 UTC | git-svn bug with blank commits and author file When trying to import from svn using an author file, git-svn bails out if it encounters a blank author. The attached patch changes this behavior and allow using the author file with blanks authors. I came across this bug while importing from a cvs2svn repo where the initial revision (1) has a blank author. This doesn't break the behavior of bailing out when an unknown author is encountered. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:39:10 UTC |
| 75b7dfb | Ariel Badichi | 23 April 2008, 01:06:27 UTC | archive.c: format_subst - fixed bogus argument to memchr Also removed a superfluous test. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:23:16 UTC |
| 8b1f6de | Ariel Badichi | 23 April 2008, 01:05:29 UTC | copy.c: copy_fd - correctly report write errors Previously, the errno could have been lost due to an intervening close() call. This patch also contains minor cosmetic changes. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:21:08 UTC |
| 82881b3 | Matthew Ogilvie | 22 April 2008, 18:19:12 UTC | gitattributes: Fix subdirectory attributes specified from root directory Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:12:37 UTC |
| 71bd81a | Andy Parkins | 21 April 2008, 13:44:44 UTC | post-receive-email: fix accidental removal of a trailing space in signature line post-receive-email adds a signature to the end of emails in generate_email_footer(). The signature was separated from the main email body using the standard string "-- ". (see RFC 3676) a6080a0 (War on whitespace, 2007-06-07) removed the trailing whitespace from "-- ", leaving it as "--", which is not a correct signature separator. This patch restores the missing space, but does it in a way that will not set off the trailing whitespace alarms. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:36:56 UTC |
| 85d17a1 | martin f. krafft | 20 April 2008, 21:23:38 UTC | Escape project names before creating pathinfo URLs If a project name contains special URL characters like +, gitweb's links break in subtle ways. The solution is to pass the project name through esc_url() and using the return value. Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:30:55 UTC |
| bbd4c30 | martin f. krafft | 20 April 2008, 21:03:56 UTC | Escape project name in regexp The project name, when used in a regular expression, needs to be quoted properly, so that stuff like '++' in the project name does not cause Perl to barf. Related info: http://bugs.debian.org/476076 This is a bug in Perl's CGI.pm, but fixing that exposed a similar bug in gitweb.perl Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:30:11 UTC |
| f457413 | Teemu Likonen | 20 April 2008, 19:32:47 UTC | bash: Add completion for git diff --base --ours --theirs Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 05:52:15 UTC |
| 37152d8 | Gerrit Pape | 21 April 2008, 18:15:52 UTC | diff-options.txt: document the new "--dirstat" option This commit adds the documentation for the new option added by 7df7c01 (Add "--dirstat" for some directory statistics, 2008-02-12). Noticed by Clint Adams, reported through http://bugs.debian.org/476437 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 05:50:21 UTC |
| 66aaa2f | Junio C Hamano | 20 April 2008, 18:36:53 UTC | GIT 1.5.5.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2008, 18:36:53 UTC |
| 41a3e3a | Junio C Hamano | 20 April 2008, 06:01:51 UTC | Merge branch 'jc/maint-rebase-am' into maint * jc/maint-rebase-am: rebase: do not munge commit log message Conflicts: git-am.sh | 20 April 2008, 06:01:51 UTC |
| 5634cf2 | Jakub Narebski | 13 April 2008, 12:12:15 UTC | gitweb: Fix 'history' view for deleted files with history When asked for history of a file which is not present in given branch ("HEAD", i.e. current branch, or given by transient $hash_hase ('hb') parameter), but is present deeper in the history (meaning that "git rev-list --full-history $hash_base -- $file_name" is not empty), and there is no $hash ('h') parameter set for a file, gitweb would spew multiple of "Use of uninitialized value" warnings, and some links would be missing. This commit fixes this bug. This bug occurs in the rare cases when "git log -- <path>" is empty and "git log --full-history -- <path>" is not, or to be more exact in the cases when full-history starts later than given branch. It can happen if you are using handcrafted gitwb URL, or if you follow generic 'history' link or bookmark for a file which got deleted. Gitweb tried to get file type ('tree', or 'blob', or even 'commit') from the commit we start searching from (where the file was not present), and not among found commits. This was the cause of "Use of uninitialized value" warnings. This commit also add tests for such situation to t9500 test. While we are it, return HTTP error if there is _no_ history; it means that file or directory was not found (for given branch). Also error out if type of item could not be found: it should not happen now, but better be sure. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2008, 05:10:38 UTC |
| f01f815 | Matthieu Moy | 13 April 2008, 13:38:21 UTC | Document that WebDAV doesn't need git on the server, and works over SSL I managed to set up a Git repository on a preconfigured WebDAV server, and using HTTPS, without installing Git on it or changing the server configuration. This works through a proxy too. This patch reflects this (it previously stated that Git was _necessary_ on the server, which isn't true). Also give a few hints to troubleshoting. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2008, 05:09:24 UTC |
| 4c414e2 | Junio C Hamano | 19 April 2008, 05:07:00 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: am: POSIX portability fix | 19 April 2008, 05:07:00 UTC |
| 24b6177 | Jonas Fonseca | 13 April 2008, 09:56:54 UTC | git-remote: reject adding remotes with invalid names This can happen if the arguments to git-remote add is switched by the user, and git would only show an error if fetching was also requested. Fix it by using the refspec parsing engine to check if the requested name can be parsed as a remote before add it. Also cleanup so that the "remote.<name>.url" config name buffer is only initialized once. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2008, 23:31:27 UTC |
| 29df238 | Junio C Hamano | 18 April 2008, 23:11:40 UTC | am: POSIX portability fix POSIX allows echo without flag to interpret specials such as \n, and we tried to make things portable by using printf instead where it matters. Recently added code to "git am" had unprotected "echo", which was caught by t4014 and Rémi Vanicat. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2008, 23:11:40 UTC |
| d0ab520 | Junio C Hamano | 17 April 2008, 00:04:05 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-am: minor cleanup Clarify and fix English in "git-rm" documentation | 17 April 2008, 00:04:05 UTC |
| 11dc4e7 | Junio C Hamano | 16 April 2008, 23:46:26 UTC | git-am: minor cleanup This moves the assignment to FIRSTLINE down so that we do not have to have multiple copies. Suggested by Linus. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 23:46:26 UTC |
| 25dc720 | Jon Loeliger | 16 April 2008, 23:41:27 UTC | Clarify and fix English in "git-rm" documentation Do some verb-noun agreement changes. Clarify some file globbing cases. Fixed a wrong statement in an example. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 23:45:23 UTC |
| 5e835ca | Junio C Hamano | 16 April 2008, 19:50:48 UTC | rebase: do not munge commit log message Traditionally git-rebase was implemented in terms of "format-patch" piped to "am -3", to strike balance between speed (because it avoids a rather expensive read-tree/merge-recursive machinery most of the time) and flexibility (the magic "-3" allows it to fall back to 3-way merge as necessary). However, this combination has one flaw when dealing with a nonstandard commit log message format that has more than one lines in the first paragraph. This teaches "git am --rebasing" to take advantage of the fact that the mbox message "git rebase" prepares for it records the original commit object name, to get the log message from the original commit object instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 19:50:48 UTC |
| 464509f | Junio C Hamano | 16 April 2008, 07:37:33 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-bisect: make "start", "good" and "skip" succeed or fail atomically git-am: cope better with an empty Subject: line Ignore leading empty lines while summarizing merges bisect: squelch "fatal: ref HEAD not a symref" misleading message builtin-apply: Show a more descriptive error on failure when opening a patch Clarify documentation of git-cvsserver, particularly in relation to git-shell | 16 April 2008, 07:37:33 UTC |
| d3e54c8 | Christian Couder | 14 April 2008, 03:41:45 UTC | git-bisect: make "start", "good" and "skip" succeed or fail atomically Before this patch, when "git bisect start", "git bisect good" or "git bisect skip" were called with many revisions, they could fail after having already marked some revisions as "good", "bad" or "skip". This could be especilally bad for "git bisect start" because as the file ".git/BISECT_NAMES" would not have been written, there would have been no attempt to clear the marked revisions on a "git bisect reset". That's because if there is no ".git/BISECT_NAMES" file, nothing is done to clean things up, as the bisect session is not supposed to have started. While at it, let's also create the ".git/BISECT_START" file, only after ".git/BISECT_NAMES" as been created. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 07:11:37 UTC |
| 2e6e3e8 | Linus Torvalds | 15 April 2008, 19:56:50 UTC | git-am: cope better with an empty Subject: line When the Subject: line is empty for whatever reason, git-am was fooled by it and left an empty line at the beginning of the resulting commit log message. This moves the logic around so that we do not keep $SUBJECT in a separate variable. Instead, $dotest/msg-clean, which used to be the log message body extracted from the message and then trailing whitespaces cleansed out, now contains the subject line followed by a blank line at the beginning for normal messages, and we use the first line from the file as the summary line throughout the program. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 07:11:04 UTC |
| 6a28518 | Linus Torvalds | 15 April 2008, 18:01:36 UTC | Ignore leading empty lines while summarizing merges "git log" and friends normally skip the initial empty lines when showing one-line summary of a commit, but merge summary didn't. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- builtin-fmt-merge-msg.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 06:53:26 UTC |
| 48949a1 | Christian Couder | 16 April 2008, 02:09:49 UTC | bisect: squelch "fatal: ref HEAD not a symref" misleading message To get the current HEAD when we start bisecting using for example "git bisect start", we first try "git symbolic-ref HEAD" to get a nice name, and if it fails, we fall back to "git rev-parse --verify HEAD". The problem is that when "git symbolic-ref HEAD" fails, it displays "fatal: ref HEAD not a symref", so it looks like "git bisect start" failed and does not accept detached HEAD, even if in fact it worked fine. This patch adds "-q" option to the "git symbolic-ref" call to get rid of the misleading error message. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 05:42:19 UTC |
| 1da1643 | Alberto Bertogli | 14 April 2008, 15:30:27 UTC | builtin-apply: Show a more descriptive error on failure when opening a patch When a patch can't be opened (it doesn't exist, there are permission problems, etc.) we get the usage text, which is not a proper indication of failure. Signed-off-by: Alberto Bertogli <albertito@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 05:42:08 UTC |
| 2c2d02a | Scott Collins | 15 April 2008, 21:44:43 UTC | Clarify documentation of git-cvsserver, particularly in relation to git-shell For SSH clients restricted to git-shell, CVS_SERVER does not have to be specified, because git-shell understands the default value of 'cvs' to mean git-cvsserver'. This makes it totally transparent to CVS users, but the instruction to set up CVS access for people with real shell access does not apply. Previous wording mentioning GIT_AUTHOR, GIT_COMMITTER variables was unclear that we really meant GIT_AUTHOR_(NAME|EMAIL), etc. Note that the .ssh/environment file is a good place to set these, and that the .bashrc is shell-specific. Add a bit of text to differentiate cvs -d (setting CVSROOT) from cvs co -d (setting the name of the newly checked out directory). Removed an extra 'Example:' string. Signed-off-by: Scott Collins <scc@ScottCollins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 05:41:54 UTC |
| 2b6f0b0 | Shawn Bohrer | 13 April 2008, 23:49:38 UTC | git clean: Add test to verify directories aren't removed with a prefix Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2008, 06:14:58 UTC |
| f2d0df7 | Shawn Bohrer | 15 April 2008, 03:14:09 UTC | git clean: Don't automatically remove directories when run within subdirectory When git clean is run from a subdirectory it should follow the normal policy and only remove directories if they are passed in as a pathspec, or -d is specified. The fix is to send len which could be shorter than ent->len because we have stripped the trailing '/' that read_directory adds. Additionaly match_one() was modified to allow a name[] that is not NUL terminated. This allows us to check if the name matched the pathspec exactly instead of recursively. Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2008, 06:14:58 UTC |
| f669ac0 | Mark Levedahl | 15 April 2008, 02:48:06 UTC | git-submodule - possibly use branch name to describe a module This changes the search logic for describing a submodule from: - annotated tag - any tag - tag on a subsequent commit - commit id to - annotated tag - any tag - tag on a subsequent commit - local or remote branch - commit id The change is describing with respect to a branch before falling back to the commit id. By itself, git-submodule will maintain submodules as headless checkouts without ever making a local branch. In general, such heads can always be described relative to the remote branch regardless of existence of tags, and so provides a better fallback summary than just the commit id. This requires inserting an extra describe step as --contains is incompatible with --all, but the latter can be used with --always to fall back to a commit ID. Also, --contains implies --tags, so the latter is not needed. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2008, 06:14:08 UTC |
| 02604e2 | Junio C Hamano | 13 April 2008, 01:57:08 UTC | t7401: squelch garbage output The script had an unconditional output done outside of test_expect_* construct, which leaked out and contaminated the output without -v. Squelch it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2008, 01:57:08 UTC |
| 51836e9 | Junio C Hamano | 13 April 2008, 01:34:39 UTC | Documentation/git-submodule: typofix Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2008, 01:34:39 UTC |
| 60e3aba | Daniel Barkalow | 12 April 2008, 19:32:00 UTC | Fix config key miscount in url.*.insteadOf Also tighten test to require it to be correct. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:41:24 UTC |
| d6d96f8 | Junio C Hamano | 12 April 2008, 22:41:19 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) Document -w option to shortlog bisect: report bad rev better | 12 April 2008, 22:41:19 UTC |
| e809507 | Clifford Caoile | 12 April 2008, 09:50:20 UTC | Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) gitk creates and uses ~/.gitk Signed-off-by: Clifford Caoile <piyo@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:39:07 UTC |
| 55ef8a4 | Junio C Hamano | 12 April 2008, 22:38:20 UTC | Document -w option to shortlog Noticed by Fredrik Noring. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:38:20 UTC |
| a179a30 | Christian Couder | 12 April 2008, 09:17:36 UTC | bisect: report bad rev better The previous one overwrote the variable used to report the bad input when the input is actually bad, and we did not give a useful enough information. This corrects it. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 22:16:13 UTC |
| eed8183 | Junio C Hamano | 12 April 2008, 06:55:55 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: bisect: fix bad rev checking in "git bisect good" revision.c: make --date-order overriddable Fix section about backdating tags in the git-tag docs Document option --only of git commit Documentation/git-request-pull: Fixed a typo ("send" -> "end") | 12 April 2008, 06:55:55 UTC |
| e338907 | Christian Couder | 12 April 2008, 05:53:59 UTC | bisect: fix bad rev checking in "git bisect good" It seems that "git bisect good" and "git bisect skip" have never properly checked arguments that have been passed to them. As soon as one of them can be parsed as a SHA1, no error or warning would be given. This is because 'git rev-parse --revs-only --no-flags "$@"' always "exit 0" and outputs all the SHA1 it can found from parsing "$@". This patch fix this by using, for each "bisect good" argument, the same logic as for the "bisect bad" argument. While at it, this patch teaches "bisect bad" to give a meaningfull error message when it is passed more than one argument. Note that if "git bisect good" or "git bisect skip" is given some proper revs and then something that is not a proper rev, then the first proper revs will still have been marked as "good" or "skip". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 06:54:45 UTC |
| a710522 | Michele Ballabio | 10 April 2008, 20:06:52 UTC | revision.c: make --date-order overriddable Jan Engelhardt noticed that while --topo-order can be overridden by a subsequent --date-order, the reverse was not possible. That's because setup_revisions() failed to set revs->lifo properly. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 06:01:33 UTC |
| a68972c | Ping Yin | 10 April 2008, 14:45:29 UTC | git-submodule: Avoid 'fatal: cannot describe' message When "git submodule status" command tries to show the name of the submodule HEAD revision more descriptively, but the submodule repository lacked a suitable tag to do so, it leaked "fatal: cannot describe" message to the UI. Squelch it by using '--always'. Signed-off-by: Ping Yin <pkufranky@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 00:35:39 UTC |
| b6309ac | Pedro Melo | 10 April 2008, 16:05:21 UTC | Force the medium pretty format on calls to git log If a user has customized format.pretty in config, git-svn rebase fails with: Unable to determine upstream SVN information from working tree history because the command expects to read the commit log in the default format. This fixes the command to explicitly ask for the format it wants to read from. Signed-off-by: Pedro Melo <melo@simplicidade.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 00:35:35 UTC |
| 055b661 | Björn Steinbrink | 11 April 2008, 20:52:07 UTC | Fix section about backdating tags in the git-tag docs The tagger is equal to the committer, not the author, so GIT_COMMITTER_DATE is the right environment variable to use, not GIT_AUTHOR_DATE. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2008, 00:34:05 UTC |
| d4ba07c | Johannes Sixt | 10 April 2008, 11:33:09 UTC | Document option --only of git commit Its documentation was removed by 6c96753 (Documentation/git-commit: rewrite to make it more end-user friendly, 2006-12-08), even though it is referenced from a few places, including builtin-commit.c (as part of the commentary in the commit message template). Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2008, 19:54:15 UTC |
| ca593f7 | Dirk Suesserott | 09 April 2008, 20:20:10 UTC | Documentation/git-request-pull: Fixed a typo ("send" -> "end") Signed-off-by: Dirk Suesserott <newsletter@dirk.my1.cc> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2008, 19:25:30 UTC |
| f59774a | Jeff King | 10 April 2008, 00:03:49 UTC | git-fetch: fix status output when not storing tracking ref There was code in update_local_ref for handling this case, but it never actually got called. It assumed that storing in FETCH_HEAD meant a blank peer_ref name, but we actually have a NULL peer_ref in this case, so we never even made it to the update_local_ref function. On top of that, the display formatting was different from all of the other cases, probably owing to the fact that nobody had ever actually seen the output. This patch harmonizes the output with the other cases and moves the detection of this case into store_updated_refs, where we can actually trigger it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:30:44 UTC |
| 179c94b | Junio C Hamano | 10 April 2008, 07:29:33 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: core-tutorial.txt: Fix showing the current behaviour. git-archive: ignore prefix when checking file attribute Fix documentation syntax of optional arguments in short options. | 10 April 2008, 07:29:33 UTC |
| abea85d | Carlos Rica | 10 April 2008, 00:08:23 UTC | core-tutorial.txt: Fix showing the current behaviour. The --root option from "git diff-tree" won't do nothing when is given to commands like git-whatchanged or git-log, because those always print the initial commit by default. This fixes the tutorial explaining the function of the log.showroot configuration variable. Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:20:41 UTC |
| ac7fa27 | René Scharfe | 09 April 2008, 21:14:43 UTC | git-archive: ignore prefix when checking file attribute Ulrik Sverdrup noticed that git-archive doesn't correctly apply the attribute export-subst when the option --prefix is given, too. When it checked if a file has the attribute turned on, git-archive would try to look up the full path -- including the prefix -- in .gitattributes. That's wrong, as the prefix doesn't need to have any relation to any existing directories, tracked or not. This patch makes git-archive ignore the prefix when looking up if value of the attribute export-subst for a file. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:20:38 UTC |
| 3f36cbb | Carlos Rica | 09 April 2008, 11:07:14 UTC | Fix documentation syntax of optional arguments in short options. When an argument for an option is optional, like in -n from git-tag, puting a space between the option and the argument is interpreted as a missing argument for the option plus an isolated argument. Documentation now reflects the need to write the parameter following the option -n, as in "git tag -nARG", for instance. Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2008, 07:20:31 UTC |
| 1d2375d | Junio C Hamano | 08 April 2008, 04:57:43 UTC | GIT 1.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2008, 04:57:43 UTC |
| fae09a8 | Junio C Hamano | 08 April 2008, 04:52:23 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix changing colors through Edit->Preferences | 08 April 2008, 04:52:23 UTC |
| f61cc48 | Eric Wong | 07 April 2008, 07:08:03 UTC | git-svn: fix following renamed paths when tracking a single path When using git-svn to follow only a single (empty) path per svn-remote (i.e. not using --stdlayout), following the history of a renamed path was broken in c586879cdfa4f8181a14e953a9152a4639eef333. This reverts the regression for the single (emtpy) path per svn-remote case. To avoid breaking the tests in a committed revision, this is an addendum to a patch originally submitted by Santhosh Kumar Mani <santhoshmani@gmail.com>: > git-svn: add test for renamed directory fetch > > This test tries to fetch a directory which had renames in the > history from a SVN repository. [ew: unneccesary dependency on the starting an HTTP server removed from Santhosh's original test.] Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 07:16:08 UTC |
| a1c0dca | Junio C Hamano | 07 April 2008, 03:04:29 UTC | Merge branch 'jc/maint-apply-match-beginning' * jc/maint-apply-match-beginning: Fix "git apply" to correctly enforce "match at the beginning" | 07 April 2008, 03:04:29 UTC |
| aba201c | Pascal Obry | 06 April 2008, 16:56:08 UTC | Add prefix oriented completions for diff and format-patch commands. Signed-off-by: Pascal Obry <pascal@obry.net> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 03:03:09 UTC |
| f2b3e3c | Christian Couder | 06 April 2008, 17:08:50 UTC | test suite: remove useless TERM cruft in "t7005-editor.sh" In commit 15387e3 (Test suite: reset TERM to its previous value after testing., 2007-10-26), I added a workaround to reset TERM to its previous value before the "test_done" at the end of "t7005-editor.sh" because otherwise "test_done" would have printed the test result with a bad TERM env variable (this resulted in output with no color on konsole). But since commit c2116a1 (test-lib: fix TERM to dumb for test repeatability, 2008-03-06), colored output is printed in a subshell with TERM reset to its original value so the earlier workaround is not needed anymore. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 03:02:43 UTC |
| d9e3b70 | Pascal Obry | 06 April 2008, 17:32:24 UTC | Add interactive option in rebase command completion list. Signed-off-by: Pascal Obry <pascal@obry.net> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 03:01:17 UTC |
| ee5a317 | Junio C Hamano | 07 April 2008, 02:21:45 UTC | Fix "git apply" to correctly enforce "match at the beginning" An earlier commit 4be6096 (apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches, 2006-09-17) made match_beginning and match_end computed incorrectly. If a hunk inserts at the beginning, old position recorded at the hunk is line 0, and if a hunk changes at the beginning, it is line 1. The new test added to t4104 exposes that the old code did not insist on matching at the beginning for a patch to add a line to an empty file. An even older 65aadb9 (apply: force matching at the beginning., 2006-05-24) was equally wrong in that it tried to take hints from the number of leading context lines, to decide if the hunk must match at the beginning, but we can just look at the line number in the hunk to decide. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 02:21:45 UTC |
| 9de328f | Peter Eriksen | 06 April 2008, 20:51:49 UTC | Add description of OFS_DELTA to the pack format description Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2008, 00:22:46 UTC |
| 80dd7b4 | Gerrit Pape | 26 March 2008, 18:45:26 UTC | gitk: Fix changing colors through Edit->Preferences With tcl/tk8.5 the lset command seems to behave differently. When changing the background color through Edit->Preferences, the changes are applied, but new dialogs, such as View->New view... barf with Error: unknown color name "{#ffffff}" Additionally when closing gitk, and starting it up again, a bad value has been saved to ~/.gitk, preventing gitk from running properly; it fails with Error in startup script: unknown color name "{#ffffff}" ... This commit fixes the problem by changing the color dialogs to pass the empty string {} as the list index to choosecolor. This causes the lset and lindex commands used by choosecolor to use and set the whole variable (bgcolor, fgcolor or selectbgcolor) rather than treating them as a 1-element list. Tested with tcl/tk8.4 and 8.5. Dmitry Potapov reported this problem through http://bugs.debian.org/472615 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 April 2008, 03:07:27 UTC |
| ba1333f | Peter Eriksen | 05 April 2008, 19:46:49 UTC | git-pack-objects.txt: Make wording slightly less ambiguous It is a bit confusing on first read, that "The packed archive format (.pack) is designed to be unpackable..." Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2008, 23:51:16 UTC |
| f53423b | Kevin Ballard | 05 April 2008, 18:28:53 UTC | git-fetch: Don't trigger a bus error when given the refspec "tag" When git-fetch encounters the refspec "tag" it assumes that the next argument will be a tag name. If there is no next argument, it should die gracefully instead of erroring. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2008, 23:31:45 UTC |
| 4ed4a34 | Jakub Narebski | 05 April 2008, 20:13:24 UTC | Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output" This reverts commit 6aa6f92fda47cc4ee5f599895e8a5a327fb6f9ab. It caused is_deleted() subroutine to output warnings when dealing with old, legacy gitweb blobdiff URLs without either 'hb' or 'hpb' parameters. This fixes http://bugs.debian.org/469083 Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2008, 23:30:49 UTC |
| 77ad7a4 | Junio C Hamano | 05 April 2008, 05:38:32 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: use +/- instead of ]/[ to show more/less context in diff git-gui: Update french translation git-gui: Switch keybindings for [ and ] to bracketleft and bracketright | 05 April 2008, 05:38:32 UTC |
| 729ffa5 | Michele Ballabio | 04 April 2008, 21:04:42 UTC | git-gui: use +/- instead of ]/[ to show more/less context in diff On some systems, brackets cannot be used as event details (they don't have a keysym), so use +/- instead (both on keyboard and keypad) and add ctrl-= as a synonym of ctrl-+ for convenience. [sp: Had to change accelerator to show only "$M1T-="; the original version included "$M1T-+ $M1T-=" but this is not drawn at all on Mac OS X.] Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2008, 04:03:19 UTC |
| ccb3b53 | Christian Couder | 05 April 2008, 02:20:23 UTC | git-gui: Update french translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 April 2008, 03:53:50 UTC |
| 54906ad | Shawn O. Pearce | 03 April 2008, 22:06:29 UTC | git-gui: Switch keybindings for [ and ] to bracketleft and bracketright Thanks to Michele Ballabio for the quick fix. This resolves the error introduced by c91ee2bd61. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 04 April 2008, 01:38:12 UTC |
| 6c41b80 | Junio C Hamano | 02 April 2008, 17:42:14 UTC | GIT 1.5.5-rc3 The rate of fixes that trickle in has slowed and we are definitely getting there. Hopefully one final round and we will have the final 1.5.5 soon. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 18:13:25 UTC |
| eedb9d9 | Junio C Hamano | 02 April 2008, 18:13:23 UTC | Merge branch 'js/filter-branch' * js/filter-branch: filter-branch: Fix renaming a directory in the tree-filter filter-branch: Test renaming directories in a tree-filter | 02 April 2008, 18:13:23 UTC |
| cfc4ba3 | Teemu Likonen | 02 April 2008, 17:06:46 UTC | Describe the bug in handling filenames with funny characters in 'git add -i' The interactive mode does not work with files whose names contain characters that need C-quoting. `core.quotepath` configuration can be used to work this limitation around to some degree, but backslash, double-quote and control characters will still have problems. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 17:36:31 UTC |
| 7ae512b | Junio C Hamano | 02 April 2008, 17:29:10 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui 0.10 git-gui: Add shortcut keys for Show More/Less Context | 02 April 2008, 17:29:10 UTC |
| 5fbd0a4 | Junio C Hamano | 02 April 2008, 07:23:19 UTC | Merge branch 'bc/mktag' * bc/mktag: mktag.c: tweak validation of tagger field and adjust test script mktag.c: improve verification of tagger field and tests | 02 April 2008, 07:23:19 UTC |
| e0efa03 | Junio C Hamano | 02 April 2008, 07:22:20 UTC | Merge branch 'pb/cvsserver' * pb/cvsserver: git-cvsserver: handle change type T | 02 April 2008, 07:22:20 UTC |
| 22e885e | Junio C Hamano | 02 April 2008, 07:22:15 UTC | Merge branch 'dd/cvsserver' * dd/cvsserver: cvsserver: Use the user part of the email in log and annotate results cvsserver: Add test for update -p cvsserver: Implement update -p (print to stdout) cvsserver: Add a few tests for 'status' command cvsserver: Do not include status output for subdirectories if -l is passed cvsserver: Only print the file part of the filename in status header cvsserver: Respond to the 'editors' and 'watchers' commands | 02 April 2008, 07:22:15 UTC |
| 860bbd5 | Junio C Hamano | 02 April 2008, 07:22:06 UTC | Merge branch 'je/cvsserver' * je/cvsserver: Allow git-cvsserver database table name prefix to be specified. | 02 April 2008, 07:22:06 UTC |
| 64fb19b | Johannes Sixt | 02 April 2008, 06:52:37 UTC | t7004-tag: Skip more tests if gpg is not available. This test was already careful enough to skip signed tag tests if gpg is not available, but it must also skip all verify tests, even those that are about non-signed tags, because they also invoke gpg. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 07:13:43 UTC |
| 69fe5ef | Johannes Sixt | 02 April 2008, 06:49:59 UTC | verify-tag: Clean up the temporary file if gpg cannot be started. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 07:08:30 UTC |
| 4637e47 | Christian Couder | 02 April 2008, 03:47:41 UTC | help: Add a missing OPT_END(). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 06:40:06 UTC |
| e85dc0a | Junio C Hamano | 01 April 2008, 04:33:09 UTC | Accept git aliases outside a git repository af05d67 (Always set *nongit_ok in setup_git_directory_gently(), 2008-03-25) had a change from the patch originally submitted that resulted in disabling aliases outside a git repository. It turns out that some people used "alias.fubar = diff --color-words" in $HOME/.gitconfig to use non-index diff (or any command that do not need git repository) outside git repositories, and this change broke them, so this resurrects the support for such usage. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2008, 06:40:02 UTC |
| 3d654be | Shawn O. Pearce | 02 April 2008, 06:17:11 UTC | git-gui 0.10 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 April 2008, 06:17:11 UTC |
| c91ee2b | Jonathan del Strother | 01 April 2008, 10:54:03 UTC | git-gui: Add shortcut keys for Show More/Less Context Bound to Ctrl/Cmd + left & right square brackets, depending on your platform. [sp: Added missing binds for . to allow shortcuts to work when not focused in the commit message area.] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 April 2008, 05:33:32 UTC |
| ba26ab9 | Brandon Casey | 31 March 2008, 23:25:23 UTC | mktag.c: tweak validation of tagger field and adjust test script Update the verify_tag() function to remove an unnecessary test, and add additional check for angle brackets in the name and email field, and spaces in the email field. The timestamp and timezone sections are made more straight forward by using strspn(). Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2008, 05:43:34 UTC |
