Permalink
Commits on Aug 22, 2009
  1. GIT 1.6.4.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 21, 2009
  2. Merge branch 'bc/maint-am-email' into maint

    * bc/maint-am-email:
      git-am: print fair error message when format detection fails
      am: allow individual e-mail files as input
    gitster committed Aug 22, 2009
Commits on Aug 21, 2009
  1. Merge branch 'jc/maint-merge-recursive-fix' into maint

    * jc/maint-merge-recursive-fix:
      merge-recursive: don't segfault while handling rename clashes
    gitster committed Aug 21, 2009
  2. Merge branch 'zf/maint-gitweb-acname' into maint

    * zf/maint-gitweb-acname:
      gitweb: parse_commit_text encoding fix
    gitster committed Aug 21, 2009
  3. Merge branch 'np/maint-limit-delta-cache' into maint

    * np/maint-limit-delta-cache:
      don't let the delta cache grow unbounded in 'git repack'
    gitster committed Aug 21, 2009
  4. Merge branch 'jk/maint-show-tag' into maint

    * jk/maint-show-tag:
      show: add space between multiple items
      show: suppress extra newline when showing annotated tag
    gitster committed Aug 21, 2009
  5. Merge branch 'sb/maint-pull-rebase' into maint

    * sb/maint-pull-rebase:
      pull: support rebased upstream + fetch + pull --rebase
      t5520-pull: Test for rebased upstream + fetch + pull --rebase
    gitster committed Aug 21, 2009
Commits on Aug 18, 2009
  1. filter-branch: make the usage string fit on 80 chars terminals.

    It used to be a single, huge line, badly wrapped by xterm.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Aug 18, 2009
  2. filter-branch: add an example how to add ACKs to a range of commits

    When you have to add certain lines like ACKs (or for that matter,
    Signed-off-by:s) to a range of commits starting with HEAD, you might
    be tempted to use 'git rebase -i -10', but that is a waste of your
    time.
    
    It is better to use 'git filter-branch' with an appropriate message
    filter, and this commit adds an example how to do so to
    filter-branch's man page.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Aug 17, 2009
Commits on Aug 17, 2009
  1. docs: describe impact of repack on "clone -s"

    The effects of repacking on a repository with alternates are a bit
    subtle. The two main things users will want are:
    
      1. Not to waste disk space by accidentally copying objects which could
         be shared.
    
      2. Copying all objects explicitly to break the dependency on the source
         repo.
    
    This patch describes both under the "clone -s" documentation. It makes
    sense to put it there rather than in git-repack.txt for both cases.
    
    For (1), we are warning the user who is using "clone -s" about what _not_
    to do, so we need to get their attention when reading about "clone -s".
    
    For (2), we are telling them how git-repack can be used to accomplish a
    task, but until they know that git-repack is the right tool, they have no
    reason to look at the repack documentation.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Aug 17, 2009
Commits on Aug 12, 2009
  1. Merge branch 'maint-1.6.3' into maint

    * maint-1.6.3:
      Change mentions of "git programs" to "git commands"
      Documentation: merge: one <remote> is required
      help.c: give correct structure's size to memset()
    gitster committed Aug 12, 2009
  2. push: point to 'git pull' and 'git push --force' in case of non-fast …

    …forward
    
    'git push' failing because of non-fast forward is a very common situation,
    and a beginner does not necessarily understand "fast forward" immediately.
    
    Add a new section to the git-push documentation and refer them to it.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Aug 8, 2009
  3. Documentation: add: <filepattern>... is optional

    <filepattern>... is optional (e.g. when the --all or --update
    options are used) so use square brackets in the synopsis.
    
    Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pebolle committed with gitster Aug 11, 2009
  4. Change mentions of "git programs" to "git commands"

    Most of the docs and printouts refer to "commands" when discussing what
    the end users call via the "git" top-level program. We should refer them
    as "git programs" when we discuss the fact that the commands are
    implemented as separate programs, but in other contexts, it is better to
    use the term "git commands" consistently.
    
    Signed-off-by: Ori Avtalion <ori@avtalion.name>
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    salty-horse committed with gitster Aug 7, 2009
  5. Documentation: merge: one <remote> is required

    merge only requires one <remote>, so "<remote>..." should be used in the
    synopsis (and not "<remote> <remote>...").
    
    Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pebolle committed with gitster Aug 11, 2009
  6. help.c: give correct structure's size to memset()

    These two structures are of the same type, but we'd better be consistent.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jherland committed with gitster Aug 11, 2009
Commits on Aug 11, 2009
  1. Merge branch 'maint-1.6.3' into maint

    * maint-1.6.3:
      Fix typos in git-remote.txt and git-symbolic-ref.txt
    gitster committed Aug 11, 2009
  2. Fix typos in git-remote.txt and git-symbolic-ref.txt

    Signed-off-by: Štěpán Němec <stepnem@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Štěpán Němec committed with gitster Aug 11, 2009
Commits on Aug 10, 2009
  1. git-am: print fair error message when format detection fails

    Avoid git ending with this message:
    	"Patch format  is not supported."
    
    With improved error message in the format detection failure case by
    Giuseppe Bilotta.
    
    Signed-off-by: Nicolas Sebrecht <ni.s@laposte.net>
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    nicolas33 committed with gitster Aug 7, 2009
  2. am: allow individual e-mail files as input

    We traditionally allowed a mbox file or a directory name of a maildir (but
    never an individual file inside a maildir) to be given to "git am".  Even
    though an individual file in a maildir (or more generally, a piece of
    RFC2822 e-mail) is not a mbox file, it contains enough information to
    create a commit out of it, so there is no reason to reject one.  Running
    mailsplit on such a file feels stupid, but it does not hurt.
    
    This builds on top of a5a6755 (git-am foreign patch support: introduce
    patch_format, 2009-05-27) that introduced mailbox format detection.  The
    codepath to deal with a mbox requires it to begin with "From " line and
    also allows it to begin with "From: ", but a random piece of e-mail can
    and often do begin with any valid RFC2822 header lines.
    
    Instead of checking the first line, we extract all the lines up to the
    first empty line, and make sure they look like e-mail headers.
    
    A test is added to t4150 to demonstrate this feature.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 7, 2009
  3. git-instaweb: fix mod_perl detection for apache2

    The script was looking for something that matched the '^our $gitbin'
    regex, which no longer exists in gitweb.cgi.
    
    Now it looks for 'MOD_PERL', which should be on the line that checks
    to see if the script is running in a mod_perl environment.
    
    Signed-off-by: Mark Rada <marada@uwaterloo.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ferrous26 committed with gitster Aug 8, 2009
Commits on Aug 8, 2009
  1. Merge branch 'maint-1.6.3' into maint

    * maint-1.6.3:
      verify-pack -v: do not report "chain length 0"
      t5510: harden the way verify-pack is used
    gitster committed Aug 8, 2009
  2. Merge branch 'maint-1.6.2' into maint-1.6.3

    * maint-1.6.2:
      verify-pack -v: do not report "chain length 0"
      t5510: harden the way verify-pack is used
    gitster committed Aug 8, 2009
  3. Merge branch 'maint-1.6.1' into maint-1.6.2

    * maint-1.6.1:
      verify-pack -v: do not report "chain length 0"
      t5510: harden the way verify-pack is used
    gitster committed Aug 8, 2009
  4. Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      verify-pack -v: do not report "chain length 0"
      t5510: harden the way verify-pack is used
    gitster committed Aug 8, 2009
  5. verify-pack -v: do not report "chain length 0"

    When making a histogram of delta chain length in the pack, the program
    collects number of objects whose delta depth exceeds the MAX_CHAIN limit
    in histogram[0], and showed it as the number of items that exceeds the
    limit correctly.  HOWEVER, it also showed the same number labeled as
    "chain length = 0".
    
    In fact, we are not showing the number of objects whose chain length is
    zero, i.e. the base objects.  Correct this.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 7, 2009
  6. t5510: harden the way verify-pack is used

    The test ignored the exit status from verify pack command, and also relied
    on not seeing any delta chain statistics.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 8, 2009
Commits on Aug 6, 2009
  1. don't let the delta cache grow unbounded in 'git repack'

    I have 4GB of RAM on my system which should, in theory, be quite enough
    to repack a 600 MB repository.  However the unbounded delta cache size
    always pushes it into swap, at which point everything virtually comes to
    a halt.  So unbounded caches are never a good idea.
    
    A default of 256MB should be a good compromize between memory usage and
    speed where medium sized repositories are still likely to fit in the
    cache with a reasonable memory usage, and larger repositories are going
    to take quite some time to repack already anyway.
    
    While at it, clarify the associated config variable documentation
    entries a bit.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nicolas Pitre committed with gitster Aug 5, 2009
Commits on Aug 5, 2009
  1. Merge branch 'maint-1.6.3' into maint

    * maint-1.6.3:
      Better usage string for reflog.
      hg-to-git: don't import the unused popen2 module
      send-email: remove debug trace
      config: Keep inner whitespace verbatim
    gitster committed Aug 5, 2009
  2. gitweb: parse_commit_text encoding fix

    Call to_utf8 when parsing author and committer names, otherwise they will appear
    with bad encoding if they written by using chop_and_escape_str.
    
    Signed-off-by: Zoltán Füzesi <zfuzesi@eaglet.hu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Zoltán Füzesi committed with gitster Aug 2, 2009
  3. gitweb/README: Document $base_url

    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Aug 4, 2009
  4. Documentation: git submodule: add missing options to synopsis

    The option --merge was missing for submodule update and --cached for
    submodule summary.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jlehmann committed with gitster Aug 1, 2009
  5. Better usage string for reflog.

    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Aug 5, 2009
Commits on Aug 4, 2009
  1. hg-to-git: don't import the unused popen2 module

    Importing the popen2 module in Python-2.6 results in the
    "DeprecationWarning: The popen2 module is deprecated.  Use the
    subprocess module." message. The module itself isn't used in fact, so
    just removing it solves the problem.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Aug 3, 2009
  2. send-email: remove debug trace

    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    kusma committed with gitster Aug 4, 2009