Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 23, 2008
  1. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
  2. @gitster

    rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref

    Johannes Sixt authored gitster committed
    The intention of --symbolic-full-name is to not print anything if a
    revision is not an exact ref. But this command:
    
        $ git-rev-parse --symbolic-full-name --not master~1
    
    still emitted a sole '^' to stdout (provided that there's no other ref at
    master~1). This fixes it.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @heikkiorsila @gitster

    Add missing "short" alternative to --date in rev-list-options.txt

    heikkiorsila authored gitster committed
    Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    git-show.txt: Not very stubby these days.

    Jon Loeliger authored gitster committed
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @spearce @gitster

    Clarify repack -n documentation

    spearce authored gitster committed
    While repacking a local repository a coworker thought the -n option
    was necessary to git-repack to keep it from updating some unknown
    file on the central server we all share.  Explaining further what
    the option is (not) doing helps to make it clear the option does
    not impact any remote repositories the user may have configured.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 21, 2008
  1. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      git-am: fix typo in usage message
      doc/git-daemon: s/uploadarchive/uploadarch/
Commits on May 20, 2008
  1. @peff @gitster

    git-am: fix typo in usage message

    peff authored gitster committed
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    doc/git-daemon: s/uploadarchive/uploadarch/

    peff authored gitster committed
    The git-daemon upload-archive feature has always used the
    config directive 'daemon.uploadarch'; the documentation
    which came later seems to have just mistakenly used the
    wrong name.
    
    Noticed by lionel@over-blog.com.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 16, 2008
  1. @gitster

    git-filter-branch: Clarify file removal example.

    Jon Loeliger authored gitster committed
    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 14, 2008
  1. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      Documentation/git-describe.txt: make description more readable
  2. @ihilt @gitster

    Documentation/git-describe.txt: make description more readable

    ihilt authored gitster committed
    Signed-off-by: Ian Hilt <ian.hilt@gmail.com>
    Credit-to: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 11, 2008
  1. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      wt-status.h: declare global variables as extern
      builtin-commit.c: add -u as short name for --untracked-files
      git-repack: re-enable parsing of -n command line option
  2. @gitster

    wt-status.h: declare global variables as extern

    Johannes Sixt authored gitster committed
    There are linkers out there that complain if a global non-static variable
    is defined multiple times.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @sitaramc @gitster

    builtin-commit.c: add -u as short name for --untracked-files

    sitaramc authored gitster committed
    This makes the C code consistent with the documentation and the old shell
    code.
    
    Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitzilla @gitster

    git-repack: re-enable parsing of -n command line option

    gitzilla authored gitster committed
    In commit 5715d0b (Migrate git-repack.sh to use git-rev-parse --parseopt,
    2007-11-04), parsing of the '-n' command line option was accidentally lost
    when git-repack.sh was migrated to use git-rev-parse --parseopt. This adds
    it back.
    
    Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 9, 2008
  1. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
      doc: clarify definition of "update" for git-add -u
Commits on May 8, 2008
  1. @dustin @gitster

    Documentation/config.txt: Mention branch.<name>.rebase applies to "gi…

    dustin authored gitster committed
    …t pull"
    
    Signed-off-by: Dustin Sallings <dustin@spy.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    doc: clarify definition of "update" for git-add -u

    peff authored gitster committed
    The "-u" option is described only in terms of "updating"
    files, which in turn is described only as "similar to what
    git commit -a does". Let's be a little more specific about
    what updating entails.
    
    Suggested by Geoffrey Irving.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 4, 2008
  1. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      filter-branch: Documentation fix.
  2. @peff @gitster

    checkout: don't rfc2047-encode oneline on detached HEAD

    peff authored gitster committed
    When calling pretty_print_commit, there is an implicit
    assumption that passing in a non-NULL "subject" variable
    for oneline or email formats means that the output is part
    of a subject and therefore "subject" to rfc2047 encoding.
    This is not the desired effect when reporting the movement
    of detached HEAD.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 3, 2008
  1. @rafl @gitster

    filter-branch: Documentation fix.

    rafl authored gitster committed
    It's --msg-filter, not --message-filter.
    
    Signed-off-by: Florian Ragwitz <rafl@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 30, 2008
  1. @gitster

    fetch-pack: brown paper bag fix

    gitster authored
    When I applied Linus's patch from the list by hand somehow I ended
    up reversing the logic by mistake.  This fixes it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      cvsimport: always pass user data to "system" as a list
      fix reflog approxidate parsing bug
  3. @peff @gitster

    cvsimport: always pass user data to "system" as a list

    peff authored gitster committed
    This avoids invoking the shell. Not only is it faster, but
    it prevents the possibility of interpreting our arguments in
    the shell.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @peff @gitster

    fix reflog approxidate parsing bug

    peff authored gitster committed
    In get_sha1_basic, we parse a string like
    
      HEAD@{10 seconds ago}:path/to/file
    
    into its constituent ref, reflog date, and path components.
    We never actually munge the string itself, but instead keep
    offsets into the string with their associated lengths.
    
    When we call approxidate on the contents inside braces,
    however, we pass just a string without a length. This means
    that approxidate could sometimes look past the closing brace
    and (erroneously) interpret the rest of the string as part
    of the date.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 29, 2008
  1. @raalkml @gitster

    Fix use after free() in builtin-fetch

    raalkml authored gitster committed
    As reported by Dave Jones:
    
    Since master.kernel.org updated to latest, I noticed that I could crash
    git-fetch by doing this..
    
    export KERNEL=/pub/scm/linux/kernel/git/
    git fetch $KERNEL/torvalds/linux-2.6 master:linus
    
    (gdb) bt
     0  0x000000349fd6d44b in free () from /lib64/libc.so.6
     1  0x000000000048f4eb in transport_unlock_pack (transport=0x7ce530) at transport.c:811
     2  0x000000349fd31b25 in exit () from /lib64/libc.so.6
     3  0x00000000004043d8 in handle_internal_command (argc=3, argv=0x7fffea4449f0) at git.c:379
     4  0x0000000000404547 in main (argc=3, argv=0x7fffea4449f0) at git.c:443
     5  0x000000349fd1c784 in __libc_start_main () from /lib64/libc.so.6
     6  0x0000000000403ef9 in ?? ()
     7  0x00007fffea4449d8 in ?? ()
     8  0x0000000000000000 in ?? ()
    
    I then remembered, my .bashrc has this..
    
    export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
    
    which is handy for showing up such bugs.
    
    More info on this glibc feature is at http://udrepper.livejournal.com/11429.html
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 28, 2008
  1. @torvalds @gitster

    fetch-pack: do not stop traversing an already parsed commit

    torvalds authored gitster committed
    f3ec549 (fetch-pack: check parse_commit/object results, 2008-03-03)
    broke common ancestor computation by stopping traversal when it sees
    an already parsed commit.  This should fix it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @raalkml @gitster

    Use "=" instead of "==" in condition as it is more portable

    raalkml authored gitster committed
    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>
  3. @gitster

    clone: detect and fail on excess parameters

    gitster authored
    "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>
  4. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      Remove 'header' from --signoff option description
  5. @toofishes @gitster

    Remove 'header' from --signoff option description

    toofishes authored gitster committed
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 25, 2008
  1. @peff @gitster

    remote: create fetch config lines with '+'

    peff authored gitster committed
    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>
  2. @peff @gitster

    push: allow unqualified dest refspecs to DWIM

    peff authored gitster committed
    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>
  3. @gitster

    Merge branch 'maint-1.5.4' into maint

    gitster authored
    * maint-1.5.4:
      t5516: remove ambiguity test (1)
      Linked glossary from cvs-migration page
      write-tree: properly detect failure to write tree objects
  4. @peff @gitster

    doc/git-gc: add a note about what is collected

    peff authored gitster committed
    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>
Something went wrong with that request. Please try again.