Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Jun 02, 2010

  1. Brandon Casey

    git-request-pull.sh: remove -e switch to shell interpreter which brea…

    …ks ksh
    
    The -e option causes the shell to exit immediately when a command exits
    with a non-zero exit status.  This does not seem to cause a problem for
    Bash, but it does cause a problem for the Korn shell, like Solaris's
    xpg4/sh, whose unset utility returns non-zero if it is passed a variable
    name which was not previously set.  When using xpg4/sh, git-request-pull
    exits while sourcing git-sh-setup since git-sh-setup tries to unset the
    CDPATH environment variable.
    
    When git-request-pull was originally written, it did not do any error
    checking and it used this shell feature to exit when an error occurred.
    This script now performs proper error checking and provides useful error
    messages, so this -e option appears to be merely a historical artifact and
    can be removed.
    
    Kudos to Jonathan Nieder for introducing t5150 which exercises the
    request-pull code path.
    
    Suggested-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored June 01, 2010 gitster committed June 02, 2010

May 08, 2010

  1. Junio C Hamano

    Merge branch 'jn/maint-request-pull' into jn/request-pull

    authored May 07, 2010

May 01, 2010

  1. jrn

    request-pull: protect against OPTIONS_KEEPDASHDASH from environment

    Like most git commands, request-pull supports a -- delimiter to allow
    callers to pass arguments that would otherwise be treated as an option
    afterwards.  The internal OPTIONS_KEEPDASHDASH variable is passed
    empty to git-sh-setup to indicate that request-pull itself does not
    care about the position of the -- delimiter.  But if the user has
    that variable in her environment, request-pull will see the “--” and
    fail.
    
    Empty it explicitly to guard against this.  While at it, make the
    corresponding fix to git-resurrect, too (all other scripts in git.git
    already protect themselves).
    
    Acked-by: Thomas Rast <trast@student.ethz.ch>
    Acked-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 24, 2010 gitster committed May 01, 2010

Jan 30, 2010

  1. Miklos Vajna

    request-pull: avoid mentioning that the start point is a single commit

    Previously we ran shortlog on the start commit which always printed
    "(1)" after the start commit, which gives no information, but makes the
    output less easy to read.  Instead of giving the author name of the
    commit, use the space for committer timestamp to help recipient judge
    the freshness of the offered branch more easily.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 29, 2010 gitster committed January 29, 2010

Jul 29, 2009

  1. Junio C Hamano

    request-pull: optionally show a patch as well

    Allow git request-pull to append diff body into the pull request.
    
    It's useful for small series of commits.
    
    Tested-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 27, 2009
  2. request-pull: allow ls-remote to notice remote.$nickname.uploadpack

    The location to pull from should be converted from the configured nickname
    to URL in the message, but ls-remote should be fed the nickname so that
    the command uses remote.$nickname.* variables, most notably "uploadpack".
    
    Signed-off-by: Tom Grennan <tgrennan@redback.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 28, 2009 gitster committed July 28, 2009

Jul 01, 2009

  1. michal42

    request-pull: really really disable pager

    Earlier 476cc72 (request-pull: really disable pager, 2009-06-30)
    tried to use the correct environment variable to disable paging
    from multiple calls to "git log" and friends, but there was one
    extra call to "git log" that was not covered by the trick.
    
    Move the setting and exporting of GIT_PAGER much earlier in the
    script to cover everybody.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 01, 2009 gitster committed July 01, 2009

Jun 30, 2009

  1. Junio C Hamano

    request-pull: really disable pager

    ff06c74 (Improve request-pull to handle non-rebased branches, 2007-05-01)
    attempted to disable pager when running subcommands in this script, but
    with a wrong variable.  If GIT_PAGER is set, it takes precedence over
    PAGER.
    
    Noticed by Michal Marek.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored June 30, 2009

Nov 17, 2008

  1. request-pull: make usage string match manpage

    The usage string of 'git request-pull' differs from he manpage
    which gives the correct 'synopsis'.
    
    Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 17, 2008 gitster committed November 17, 2008

Jul 13, 2008

  1. git-request-pull: replace call to deprecated peek-remote

    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 09, 2008 gitster committed July 13, 2008

Nov 18, 2007

  1. Junio C Hamano

    Merge branch 'ph/parseopt-sh'

    * ph/parseopt-sh:
      git-quiltimport.sh fix --patches handling
      git-am: -i does not take a string parameter.
      sh-setup: don't let eval output to be shell-expanded.
      git-sh-setup: fix parseopt `eval` string underquoting
      Give git-am back the ability to add Signed-off-by lines.
      git-rev-parse --parseopt
      scripts: Add placeholders for OPTIONS_SPEC
      Migrate git-repack.sh to use git-rev-parse --parseopt
      Migrate git-quiltimport.sh to use git-rev-parse --parseopt
      Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash
      Migrate git-instaweb.sh to use git-rev-parse --parseopt
      Migrate git-merge.sh to use git-rev-parse --parseopt
      Migrate git-am.sh to use git-rev-parse --parseopt
      Migrate git-clone to use git-rev-parse --parseopt
      Migrate git-clean.sh to use git-rev-parse --parseopt.
      Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt
      Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts.
    authored November 17, 2007

Nov 08, 2007

  1. Avoid a few unportable, needlessly nested "...`...".

    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 08, 2007 gitster committed November 08, 2007

Nov 06, 2007

  1. Junio C Hamano

    scripts: Add placeholders for OPTIONS_SPEC

    --text follows this line--
    These commands currently lack OPTIONS_SPEC; allow people to
    easily list with "git grep 'OPTIONS_SPEC=$'" what they can help
    improving.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 06, 2007

Jul 03, 2007

  1. Junio C Hamano

    Rewrite "git-frotz" to "git frotz"

    This uses the remove-dashes target to replace "git-frotz" to "git frotz".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 02, 2007

May 04, 2007

  1. Shawn O. Pearce

    Improve request-pull to handle non-rebased branches

    This is actually a few different changes to request-pull,
    making it slightly smarter:
    
     1) Minor cleanup of revision->base variable names, making it
        follow the head/headrev naming convention that is already
        in use.
    
     2) Compute the merge-base between the two revisions upfront
        and reuse that selected merge-base to create the diffstat.
    
     3) Refuse to generate a pull request for branches that have no
        existing relationship.  These aren't very common and would mess
        up our diffstat generation.
    
     4) Disable the PAGER when running shortlog and diff, as these
        would otherwise activate the pager for each command when
        git-request-pull is run on a tty.  Instead users can get the
        entire output paged (if desired) using `git -p request-pull`.
    
     5) Use shortlog rather than `git log | git shortlog` now that
        recent shortlog versions are able to run the revision listing
        internally.
    
     6) Attempt to resolve the input URL using the user's configured
        remotes.  This is useful if the URL you want the recipient to
        see is also the one you used to push your changes.  If not a
        config-file remote could easily be setup for the public URL
        and request-pull could be passed that name instead.
    
     7) Automatically guess and include the remote branch name in the
        body of the message.  We list the branch name immediately after
        the URL, making it easy for the recipient to copy and paste
        the entire line onto a `git pull` command line.  Rumor has it
        Linus likes this format, for exactly that reason.
    
        If multiple branches at the remote match $headrev we take the
        first one returned by peek-remote and assume it is suitable.
    
        If no branches are available we warn the user about the problem,
        but insert a static string that is not a valid branch name
        and would be obvious to anyone reading the message as being
        totally incorrect.  This allows users to still generate a
        template message without network access (for example) and
        hand-correct the bits that cannot be verified.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 01, 2007 Junio C Hamano committed May 03, 2007

Dec 04, 2006

  1. davem330

    Pass -M to diff in request-pull

    Linus recommended this, otherwise any renames cause the
    diffstat output to be ridiculous in some circumstances.
    
    Because the corresponding "git-pull" done when the requestee
    actually makes pull shows the stat with rename detection
    enabled, it makes sense to match what the request message
    includes to that output, to make the result easier to verify.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored December 03, 2006 Junio C Hamano committed December 04, 2006

May 14, 2006

  1. Sean

    Convert some "apply --summary" users to "diff --summary".

    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored May 14, 2006 Junio C Hamano committed May 14, 2006

Dec 14, 2005

  1. Trivial usage string clean-up

    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored December 13, 2005 Junio C Hamano committed December 14, 2005

Sep 08, 2005

  1. Big tool rename.

    As promised, this is the "big tool rename" patch.  The primary differences
    since 0.99.6 are:
    
      (1) git-*-script are no more.  The commands installed do not
          have any such suffix so users do not have to remember if
          something is implemented as a shell script or not.
    
      (2) Many command names with 'cache' in them are renamed with
          'index' if that is what they mean.
    
    There are backward compatibility symblic links so that you and
    Porcelains can keep using the old names, but the backward
    compatibility support  is expected to be removed in the near
    future.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored September 07, 2005
Something went wrong with that request. Please try again.