Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 29, 2007
  1. @gitster

    GIT 1.5.3-rc7

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    git-svn.txt: fix an obvious misspelling.

    David Kastrup authored gitster committed
    Signed-off-by: David Kastrup <dak@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @dkagedal @gitster

    git.el: Added colors for dark background

    dkagedal authored gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    format-patch documentation: reword to hint "--root <one-commit>" more…

    gitster authored
    … clearly
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'jc/logsemantics'

    gitster authored
    * jc/logsemantics:
      "format-patch --root rev" is the way to show everything.
      Porcelain level "log" family should recurse when diffing.
  6. @gitster

    Documentation/git-diff: A..B and A...B cannot take tree-ishes

    gitster authored
    As pointed out by Linus, these notations require the endpoints
    given by the end user to be commits.  Clarify.
    
    Also, three-dots in AsciiDoc are turned into ellipses unless
    quoted with bq.  Be careful.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    git-add: Make the filename globbing note a bit clearer

    Petr Baudis authored gitster committed
    I think the trick with Git-side filename globbing is important and perhaps
    not that well known.  Clarify a bit in git-add documentation what it means.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @gitster

    git-add: Make the "tried to add ignored file" error message less conf…

    Petr Baudis authored gitster committed
    …using
    
    Currently the error message seems to imply (at least to me) that only
    the listed files were withheld and the rest of the files was added to the
    index, even though that's obviously not the case.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @jnareb @gitster

    gitweb: Fix escaping HTML of project owner in 'projects_list' and

    jnareb authored gitster committed
    'summary' views
    
    This for example allows to put email address in the project owner
    field in the projects index file (when $projects_list points to
    a file, and not to a directory), in the form of:
    
    path/to/repo.git Random+J+Developer+<random@developer.example.org>
    
    Noticed-by: Jon Smirl <jonsmirl@gmail.com>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 28, 2007
  1. @gitster

    "format-patch --root rev" is the way to show everything.

    gitster authored
    We used to trigger the special case "things not in origin"
    semantics only when one and only one positive ref is given, and
    no number (e.g. "git format-patch -4 origin") was specified, and
    used the general revision range semantics for everything else.
    
    This narrows the special case a bit more, by making:
    
    	git format-patch --root this_version
    
    to show everything that leads to the named commit.
    
    More importantly, document the two different semantics better.
    The generic revision range semantics came later and bolted on
    without being clearly documented.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Porcelain level "log" family should recurse when diffing.

    gitster authored
    Most notably, "git log --name-status" stopped at top level
    directory changes without "-r" option.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    git-merge: do up-to-date check also for all strategies

    gitster authored
    This clarifies the logic to omit fast-forward check and omit
    trivial merge before running the specified strategy.
    
    The "index_merge" variable started out as a flag to say "do not
    do anything clever", but when recursive was changed to skip the
    trivial merge, the semantics were changed and the variable alone
    does not make sense anymore.
    
    This splits the variable into two, allow_fast_forward (which is
    almost always true, and avoids making a merge commit when the
    other commit is a descendant of our branch, but is set to false
    for ours and subtree) and allow_trivial_merge (which is false
    for ours, recursive and subtree).
    
    Unlike the earlier implementation, the "ours" strategy allows an
    up-to-date condition.  When we are up-to-date, the result will
    be our commit, and by definition, we will have our tree as the
    result.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    git --bare cmd: do not unconditionally nuke GIT_DIR

    gitster authored
    "GIT_DIR=some.where git --bare cmd" and worse yet
    "git --git-dir=some.where --bare cmd" were very confusing.  They
    both ignored git-dir specified, and instead made $cwd as GIT_DIR.
    
    This changes --bare not to override existing GIT_DIR.
    
    This has been like this for a long time.  Let's hope nobody sane
    relied on this insane behaviour.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Fix initialization of a bare repository

    gitster authored
    Here is my attempt to fix this with a minimally intrusive patch.
    
     * As "git --bare init" cannot tell if it was called with --bare or
       just "GIT_DIR=. git init", I added an explicit assignment of
       is_bare_repository_cfg on the codepath for "git --bare".
    
     * GIT_WORK_TREE alone without GIT_DIR does not make any sense,
       nor GIT_WORK_TREE with an explicit "git --bare".  Catch that
       mistake.  It might make sense to move this check to "git.c"
       side as well, but I tried to shoot for the minimum change for
       now.
    
     * Some scripts, especially from the olden days, rely on
       traditional GIT_DIR behaviour in "git init".  Namely, these
       are some notable patterns:
    
       (create a bare repository)
       - mkdir some.git && cd some.git && GIT_DIR=. git init
       - mkdir some.git && cd some.git && git --bare init
    
       (create a non-bare repository)
       - mkdir .git && GIT_DIR=.git git init
       - mkdir .git && GIT_DIR=`pwd`/.git git init
    
    This comes with a new test script and also passes the existing
    test suite, but there may be cases that are still broken with
    the current tip of master and this patch does not yet fix.  I'd
    appreciate help in straightening this mess out.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @dscho @gitster

    name-rev: Fix non-shortest description

    dscho authored gitster committed
    Uwe Kleine-König noticed that under certain circumstances, name-rev
    picked a non-optimal tag.  Jeff King analyzed that name-rev only
    takes into account the number of merge traversals, and then the
    _last_ number in the description.
    
    As an easy way to fix it, use a weighting factor for merge traversals:
    A merge traversal is now made 65535 times more expensive than a
    first-parent traversal.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @glandium @gitster

    Describe two-dot and three-dot notation for diff endpoints.

    glandium authored gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 27, 2007
  1. @jaalto @gitster

    git-tag(1): Remove duplicate text

    jaalto authored gitster committed
    Options -d, -l, -v have already been explained in OPTIONS below.
    
    Signed-off-by: Jari Aalto <jari.aalto@cante.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    gitweb: Lift any characters restriction on searched strings

    Petr Baudis authored gitster committed
    Everything is already fully quoted along the way so I believe this to be
    unnecessary at this point. It would pose trouble for regexp searches.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    RelNotes draft for 1.5.3 update.

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'master' of git://repo.or.cz/git-gui

    gitster authored
    * 'master' of git://repo.or.cz/git-gui:
      git-gui: Correct 'git gui blame' in a subdirectory
      git-gui: Do not offer to stage three-way diff hunks into the index
      git-gui: Refactor diff pane popup support for future improvements
      git-gui: Fix "unoptimized loading" to not cause git-gui to crash
      git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
      git-gui: Allow git-merge to use branch names in conflict markers
      git-gui: Fix window manager problems on ion3
Commits on Aug 26, 2007
  1. @whee @gitster

    When nothing to git-commit, honor the git-status color setting.

    whee authored gitster committed
    Instead of disabling color all of the time during a git-commit, allow
    the user's config preference in the situation where there is nothing
    to commit.  In this situation, the status is printed to the terminal
    and not sent to COMMIT_EDITMSG, so honoring the status color setting
    is expected.
    
    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    gitweb: Fix searchbox positioning

    Petr Baudis authored gitster committed
    Currently, searchbox is CSS'd to have position: absolute, which has the
    unfortunate consequence that if the viewport is too small and can't fit
    into the page width together with the navbar, it gets overlapped and part
    of the navbar gets obscured. This makes searchbox float: right instead,
    thus the navbar simply gets wrapped.
    
    Discovered and fix pointed out by Michael Olson <mwolson@gnu.org>.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'master' of git://linux-nfs.org/~bfields/git

    gitster authored
    * 'master' of git://linux-nfs.org/~bfields/git:
      Documentation/user-manual.txt: fix a few omissions of gitlink commands.
      user-manual: fix incorrect header level
      user-manual: use pithier example commit
      user-manual: introduce the word "commit" earlier
      user-manual: minor editing for conciseness
      user-manual: edit "ignoring files" for conciseness
      Documentation/user-manual.txt: fix a few omissions of gitlink commands.
  4. Merge branch 'maint'

    J. Bruce Fields authored
    Conflicts:
    
    	Documentation/user-manual.txt
  5. Documentation/user-manual.txt: fix a few omissions of gitlink commands.

    David Kastrup authored J. Bruce Fields committed
    Signed-off-by: David Kastrup <dak@gnu.org>
  6. user-manual: fix incorrect header level

    J. Bruce Fields authored
    This section is a subsection of the "Examples" section.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  7. user-manual: use pithier example commit

    J. Bruce Fields authored
    Actually, we should have a competition for the favorite example commit.
    Criteria:
    
    	- length: one-line changes with one-line comments preferred,
    	  and no long lines
    	- significance/memorability
    	- comic value
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  8. user-manual: introduce the word "commit" earlier

    J. Bruce Fields authored
    Use the word "commit" as a synonym for "version" from the start.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  9. user-manual: minor editing for conciseness

    J. Bruce Fields authored J. Bruce Fields committed
    Just cutting out a few unnecessary words.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  10. user-manual: edit "ignoring files" for conciseness

    J. Bruce Fields authored J. Bruce Fields committed
    The immediate motivation for writing this section was to explain the
    various places ignore patterns could be used.  However, I still think
    .gitignore is the case most people will want to learn about first.  It
    also makes it a bit more concrete to introduce ignore patterns in the
    context of .gitignore first.  And the existance of gitignore(5) relieves
    the pressure to explain it all here.
    
    So, stick to the .gitignore example, with only a brief mention of the
    others, explain the syntax only by example, and leave the rest to
    gitignore(5).
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Cc: Johan Herland <johan@herland.net>
  11. Documentation/user-manual.txt: fix a few omissions of gitlink commands.

    David Kastrup authored J. Bruce Fields committed
    Signed-off-by: David Kastrup <dak@gnu.org>
  12. @whee @gitster

    Make usage documentation for git-add consistent.

    whee authored gitster committed
    The usage string for the executable was missing --refresh.  In
    addition, the documentation referred to "file", but the usage string
    referred to "filepattern".  Updated the documentation to
    "filepattern", as git-add does handle patterns.
    
    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @whee @gitster

    Make usage documentation for git-am consistent.

    whee authored gitster committed
    The usage information in git-am.sh now matches that of the
    documentation.
    
    Signed-off-by: Brian Hetro <whee@smaertness.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 25, 2007
  1. @spearce @gitster

    Don't segfault if we failed to inflate a packed delta

    spearce authored gitster committed
    Under some types of packfile corruption the zlib stream holding the
    data for a delta within a packfile may fail to inflate, due to say
    a CRC failure within the compressed data itself.  When this occurs
    the unpack_compressed_entry function will return NULL as a signal to
    the caller that the data is not available.  Unfortunately we then
    tried to use that NULL as though it referenced a memory location
    where a delta was stored and tried to apply it to the delta base.
    Loading a byte from the NULL address typically causes a SIGSEGV.
    
    cate on #git noticed this failure in `git fsck --full` where the
    call to verify_pack() first noticed that the packfile was corrupt
    by finding that the packfile's SHA-1 did not match the raw data of
    the file.  After finding this fsck went ahead and tried to verify
    every object within the packfile, even though the packfile was
    already known to be bad.  If we are going to shovel bad data at
    the delta unpacking code, we better handle it correctly.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    pack-objects: check return value from read_sha1_file()

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.