Permalink
Commits on Jun 7, 2008
  1. GIT 1.5.6-rc2

    gitster committed Jun 7, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge 1.5.5.4 in

    gitster committed Jun 7, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. GIT 1.5.5.4

    gitster committed Jun 7, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 6, 2008
  1. git log --graph: print '*' for all commits, including merges

    simpkins committed with gitster Jun 5, 2008
    Previously, merge commits were printed with 'M' instead of '*'.  This
    had the potential to confuse users when not all parents of the merge
    commit were included in the log output.
    
    As Junio has pointed out, merge commits can almost always be easily
    identified from the log message, anyway.
    
    Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Use nonrelative paths instead of absolute paths for cloned repositories

    Daniel Barkalow committed with gitster Jun 6, 2008
    Particularly for the "alternates" file, if one will be created, we
    want a path that doesn't depend on the current directory, but we want
    to retain any symlinks in the path as given and any in the user's view
    of the current directory when the path was given.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. documentation: move git(7) to git(1)

    chriscool committed with gitster Jun 6, 2008
    As the "git" man page describes the "git" command at the end-user
    level, it seems better to move it to man section 1.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. documentation: convert "diffcore" and "repository-layout" to man pages

    chriscool committed with gitster Jun 6, 2008
    This patch renames the following documents and at the same time converts
    them to the man format:
    
    diffcore.txt          -> gitdiffcore.txt		(man section 7)
    repository-layout.txt -> gitrepository-layout.txt	(man section 5)
    
    Other documents that reference the above ones are changed accordingly.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. graph API: fix "git log --graph --first-parent"

    simpkins committed with gitster Jun 5, 2008
    This change teaches the graph API that only the first parent of each
    commit is interesting when "--first-parent" was specified.
    
    This change also consolidates the graph parent walking logic into two
    new internal functions, first_interesting_parent() and
    next_interesting_parent().  A simpler fix would have been to simply
    break at the end of the 2 existing for loops when
    graph->revs->first_parent_only is set.  However, this change seems
    nicer, especially if we ever need to add any new loops over the parent
    list in the future.
    
    Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Print info about "git help COMMAND" on git's main usage pages

    tlikonen committed with gitster Jun 5, 2008
    Git's main usage pages did not show "git help" as a way to get more
    information on a specific subcommand. This patch adds an info line after
    the list of git commands currently printed by "git", "git help", "git
    --help" and "git help --all".
    
    Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Merge branch 'maint'

    gitster committed Jun 6, 2008
    * maint:
      git-for-each-ref.txt: minor improvements
      name-rev: Fix segmentation fault when using --all
  8. git-for-each-ref.txt: minor improvements

    Lea Wiemann committed with gitster Jun 5, 2008
    Rewrapped synopsis and removed wrong asterisk behind --count option;
    clarified --sort=<key> description for multiple keys; documented that
    for-each-ref supports not only glob patterns but also prefixes like
    "refs/heads" as patterns, and that multiple patterns can be given.
    
    Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. name-rev: Fix segmentation fault when using --all

    dotdash committed with gitster Jun 5, 2008
    In commit da2478d "describe --always: fall back to showing an
    abbreviated object name" we lost the check that skips empty entries in
    the object hash table when iterating over it in cmd_name_rev. That may
    cause a NULL pointer being handed to show_name(), leading to a
    segmentation fault. So add that check back again.
    
    Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 4, 2008
  1. gitweb: Add charset info to "raw" output of 'text/plain' blobs

    jnareb committed with gitster Jun 3, 2008
    Earlier "blob_plain" view sent "charset=utf-8" only when gitweb
    guessed the content type to be text by reading from it, and not when
    the MIME type was obtained from /etc/mime.types, or when gitweb
    couldn't guess mimetype and used $default_blob_plain_mimetype.
    
    This fixes the bug by always add charset info from
    $default_text_plain_charset (if it is defined) to "raw" (a=blob_plain)
    output for 'text/plain' blobs.
    
    Generating information for Content-Type: header got separated into
    blob_contenttype() subroutine; adding charset info in a special case
    was removed from blob_mimetype(), which now should return mimetype
    only.
    
    While at it cleanup code a bit: put subroutine parameter
    initialization first, make error message more robust (when $file_name
    is not defined) if more cryptic, remove unnecessary '"' around
    variable ("$var" -> $var).
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Strbuf documentation: document most functions

    Miklos Vajna committed with gitster Jun 4, 2008
    All functions in strbuf.h are documented, except launch_editor().
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation/git-mailsplit: Enhanced description of -o option

    Dirk Suesserott committed with gitster Jun 4, 2008
    Added '-o' in the description of '-o<directory>' for consistency reasons.
    
    Signed-off-by: Dirk Suesserott <newsletter@dirk.my1.cc>
  4. Fix "git clone http://$URL" to check out the worktree when asked

    peff committed with gitster Jun 4, 2008
    The builtin-clone now does the http commit walking and the tree unpacking
    in the same process, and the commit walker leaves the in-core objects in a
    funny state.  When forgetting the data read from the tree object, the
    object should be marked "not parsed yet" for later users.
    
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'maint'

    gitster committed Jun 4, 2008
    * maint:
      describe: match pattern for lightweight tags too
  6. describe: match pattern for lightweight tags too

    Michael Dressel committed with gitster Jun 4, 2008
    The <pattern> given "git describe --match" was used only to filter tag
    objects, and not to filter lightweight tags.  This fixes it.
    
    [jc: made the log to clarify this is a bugfix, not an enhancement, with
    additional test]
    
    Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. t7502: honor SHELL_PATH

    gitster committed Jun 4, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Documentation: git-log cannot use rev-list specific options

    gitster committed Jun 4, 2008
    The log family and git-rev-list share the same set of options that come
    from revision walking machinery, but they both have options unique to
    them.  Notably, --header, --timestamp, --stdin and --quiet apply only to
    rev-list.  Exclude them from the git-log documentation.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. Fix t5516 on cygwin: it does not like double slashes at the beginning…

    raalkml committed with gitster Jun 3, 2008
    … of a path
    
    The double slashes "//" result from url./$TRASH/. expansion and the
    current directory, which even in cygwin contains "/" as first
    character. In cygwin such strings have special meaning: UNC path.
    Accessing an UNC path built for test purpose usually fails.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. t7502: tighten loosely written test sequence

    gitster committed Jun 4, 2008
    We would like to catch breakage at any step in the sequence.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. t7502: do not globally unset GIT_COMMITTER_* environment variables

    gitster committed Jun 4, 2008
    One particular test wants to check the behaviour of the command
    when these variables are not set, but the later tests should have
    the reliable committer identity for repeatable tests.
    
    Move the "unset" of the variables inside a subshell in the test
    that wants to unset them.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 3, 2008
  1. cat-file --batch: flush stdout also when objects are missing

    Lea Wiemann committed with gitster Jun 3, 2008
    cat-file --batch/--batch-check only flushes stdout when the object
    exists, but not when it doesn't ("<object> missing").  This makes
    bidirectional pipes hang.
    
    Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. GIT v1.5.6-rc1

    gitster committed Jun 3, 2008
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. commit: drop duplicated parents

    gitster committed Jun 3, 2008
    The scripted version of git-commit internally used git-commit-tree which
    omitted duplicated parents given from the command line.  This prevented a
    nonsensical octopus merge from getting created even when you said "git
    merge A B" while you are already on branch A.
    
    However, when git-commit was rewritten in C, this sanity check was lost.
    This resurrects it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. rebase --interactive: Compute upstream SHA1 before switching branches

    Johannes Sixt committed with gitster Jun 2, 2008
    If the upstream argument to rebase (the first argument) was relative to
    HEAD and the name of the branch to rebase (the second argument) was given,
    the upstream would have been interpreted relative to the second argument.
    In particular, this command
    
        git rebase -i HEAD topic
    
    would always finish with "Nothing to do". (a1bf91e fixed the same issue
    for non-interactive rebase.)
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Documentation/git-filter-branch.txt: Fix description of --commit-filter

    kballard committed with gitster May 30, 2008
    The old description was misleading and logically impossible. It claimed that
    the ancestors of the original commit would be re-written to have the multiple
    emitted ids as parents. Not only would this modify existing objects, but it
    would create a cycle. What this actually does is pass the multiple emitted ids
    to the newly-created children to use as parents.
    
    Signed-off-by: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. gitweb: Fix "next" link on bottom of page

    jnareb committed with gitster Jun 2, 2008
    Fix search form generation to not modify $cgi->param(...)'s.
    
    In git_header_html() we used to use $cgi->hidden(-name => "a") etc. to
    generate hidden fields; unfortunately to use this form it is required
    to modify $cgi->param("a") etc., which makes href(-replay,...) use
    wrong replay values.  This for example made the "next" link on the
    bottom of the page has a=search instead of a=$action, and thus fails to
    get you to the next page.
    
    Because in CGI the value of a hidden field is "sticky", there is no
    way to modify it short of modifying $cgi->param(...).  Therefore it
    got replaced by generating <input type="hidden" ...> element [semi]
    directly.
    
    Alternate solution would be for href(-replay,...) to use values saved
    in global variables, such as $action etc., instead of (re)reading them
    from $cgi->param($symbol).
    
    The bad link was reported by Kai Blin through
      http://bugs.debian.org/481902
    
    Reported-by: Kai Blin <kai.blin@gmail.com>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Tested-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Revert "git.el: Set process-environment instead of invoking env"

    kwiberg committed with gitster Jun 2, 2008
    This reverts commit dbe4825, which
    caused mis-encoding of non-ASCII author/committer names when the
    git-status mode is used to create commits.
    
    Signed-off-by: Karl Hasselström <kha@treskal.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 2, 2008
  1. Merge branch 'sb/am-tests'

    gitster committed Jun 2, 2008
    * sb/am-tests:
      Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
      Add test cases for git-am
  2. Merge branch 'lw/test-fix'

    gitster committed Jun 2, 2008
    * lw/test-fix:
      t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
  3. Merge branch 'sp/remote'

    gitster committed Jun 2, 2008
    * sp/remote:
      Make "git-remote rm" delete refs acccording to fetch specs
      Make "git-remote prune" delete refs according to fetch specs
      Remove unused remote_prefix member in builtin-remote
  4. Merge branch 'lt/pack-sync'

    gitster committed Jun 2, 2008
    * lt/pack-sync:
      Remove now unnecessary 'sync()' calls
      Make pack creation always fsync() the result
  5. Merge branch 'np/pack-check'

    gitster committed Jun 2, 2008
    * np/pack-check:
      make verify-pack a bit more useful with bad packs