Permalink
Commits on Apr 20, 2008
  1. GIT 1.5.5.1

    gitster committed Apr 20, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/maint-rebase-am' into maint

    gitster committed Apr 20, 2008
    * jc/maint-rebase-am:
      rebase: do not munge commit log message
    
    Conflicts:
    
    	git-am.sh
Commits on Apr 19, 2008
  1. gitweb: Fix 'history' view for deleted files with history

    jnareb authored and gitster committed Apr 13, 2008
    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>
  2. Document that WebDAV doesn't need git on the server, and works over SSL

    moy authored and gitster committed Apr 13, 2008
    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>
  3. Merge branch 'maint-1.5.4' into maint

    gitster committed Apr 19, 2008
    * maint-1.5.4:
      am: POSIX portability fix
Commits on Apr 18, 2008
  1. git-remote: reject adding remotes with invalid names

    jonas authored and gitster committed Apr 13, 2008
    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>
  2. am: POSIX portability fix

    gitster committed Apr 18, 2008
    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>
Commits on Apr 17, 2008
  1. Merge branch 'maint-1.5.4' into maint

    gitster committed Apr 17, 2008
    * maint-1.5.4:
      git-am: minor cleanup
      Clarify and fix English in "git-rm" documentation
Commits on Apr 16, 2008
  1. git-am: minor cleanup

    gitster committed Apr 16, 2008
    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>
  2. Clarify and fix English in "git-rm" documentation

    Jon Loeliger authored and gitster committed Apr 16, 2008
    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>
  3. rebase: do not munge commit log message

    gitster committed Apr 16, 2008
    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>
  4. Merge branch 'maint-1.5.4' into maint

    gitster committed Apr 16, 2008
    * 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
  5. git-bisect: make "start", "good" and "skip" succeed or fail atomically

    chriscool authored and gitster committed Apr 14, 2008
    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>
  6. git-am: cope better with an empty Subject: line

    torvalds authored and gitster committed Apr 15, 2008
    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>
  7. Ignore leading empty lines while summarizing merges

    torvalds authored and gitster committed Apr 15, 2008
    "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>
  8. bisect: squelch "fatal: ref HEAD not a symref" misleading message

    chriscool authored and gitster committed Apr 16, 2008
    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>
  9. builtin-apply: Show a more descriptive error on failure when opening …

    albertito authored and gitster committed Apr 14, 2008
    …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>
  10. Clarify documentation of git-cvsserver, particularly in relation to g…

    scc authored and gitster committed Apr 15, 2008
    …it-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>
Commits on Apr 15, 2008
  1. git clean: Add test to verify directories aren't removed with a prefix

    sbohrer authored and gitster committed Apr 13, 2008
    Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. git clean: Don't automatically remove directories when run within sub…

    sbohrer authored and gitster committed Apr 15, 2008
    …directory
    
    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>
  3. git-submodule - possibly use branch name to describe a module

    mark987 authored and gitster committed Apr 15, 2008
    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>
Commits on Apr 13, 2008
  1. t7401: squelch garbage output

    gitster committed Apr 13, 2008
    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>
  2. Documentation/git-submodule: typofix

    gitster committed Apr 13, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 12, 2008
  1. Fix config key miscount in url.*.insteadOf

    Daniel Barkalow authored and gitster committed Apr 12, 2008
    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>
  2. Merge branch 'maint-1.5.4' into maint

    gitster committed Apr 12, 2008
    * maint-1.5.4:
      Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
      Document -w option to shortlog
      bisect: report bad rev better
  3. Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)

    piyo authored and gitster committed Apr 12, 2008
    gitk creates and uses ~/.gitk
    
    Signed-off-by: Clifford Caoile <piyo@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Document -w option to shortlog

    gitster committed Apr 12, 2008
    Noticed by Fredrik Noring.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. bisect: report bad rev better

    chriscool authored and gitster committed Apr 12, 2008
    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>
  6. Merge branch 'maint-1.5.4' into maint

    gitster committed Apr 12, 2008
    * 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")
  7. bisect: fix bad rev checking in "git bisect good"

    chriscool authored and gitster committed Apr 12, 2008
    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>
  8. revision.c: make --date-order overriddable

    chunga authored and gitster committed Apr 10, 2008
    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>
  9. git-submodule: Avoid 'fatal: cannot describe' message

    pkufranky authored and gitster committed Apr 10, 2008
    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>
  10. Force the medium pretty format on calls to git log

    melo authored and gitster committed Apr 10, 2008
    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>
  11. Fix section about backdating tags in the git-tag docs

    dotdash authored and gitster committed Apr 11, 2008
    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>
Commits on Apr 11, 2008
  1. Document option --only of git commit

    Johannes Sixt authored and gitster committed Apr 10, 2008
    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>