Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 16, 2008
  1. @gitster

    Update draft release notes for 1.5.5

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

    Resurrect git-rerere to contrib/examples

    gitster authored
    It is handy to have a copy readily available for checking regressions.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Start draft ReleaseNotes for 1.5.4.5
      rebase -m: do not trigger pre-commit verification
    
    Conflicts:
    
    	RelNotes
  4. @gitster

    Start draft ReleaseNotes for 1.5.4.5

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

    rebase -m: do not trigger pre-commit verification

    gitster authored
    When rebasing changes that contain issues that the pre-commit hook flags
    as problematic, the rebase cannot be continued.  However, rebase is about
    transplanting commits that are already made with as little distortion as
    possible, and pre-commit check should not interfere.
    
    Earlier, c5b09fe (Avoid update hook during git-rebase --interactive,
    2007-12-19) fixed "rebase -i", but "rebase -m" shared the same issue.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

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

    gitster authored
    * 'master' of git://repo.or.cz/git-gui:
      git-gui: Improve directions regarding POT update in po/README
      git-gui: Update Japanese translation
      git-gui: Adjusted Japanese translation to updated POT
      git-gui: Update Japanese translation
      git-gui: Don't translate the special Apple menu
      git-gui: Updated Hungarian translation (e5fba18)
      git-gui: update russian translation
      git-gui: remove spurious "fuzzy" attributes in po/it.po
      git-gui: updated Swedish translation
      git-gui: Regenerated po template and merged translations with it
      Update Hungarian translation. 100% completed.
      git-gui: update Italian translation
  7. @gitster @spearce

    git-gui: Improve directions regarding POT update in po/README

    gitster authored spearce committed
    Keeping POT up to date relative to the software is absolutely
    necessary.  What is unwarranted is updating language files at
    the same time by running msgmerge without checking if there is
    any outstanding translation work first.  If we assume that the
    translators do not have access to msgmerge, that is a good service
    to them (the less they have to do, the better), but otherwise,
    it is better to be leave po/${language}.po files alone.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  8. @spearce

    git-gui: Update Japanese translation

    しらいしななこ authored spearce committed
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Mar 15, 2008
  1. @gitster

    Redo "add test_cmp function for test scripts"

    gitster authored
    We had a handful test updates since we accepted 82ebb0b (add test_cmp
    function for test scripts).  This fixes them up.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jk/portable'

    gitster authored
    * jk/portable:
      t6000lib: re-fix tr portability
      t7505: use SHELL_PATH in hook
      t9112: add missing #!/bin/sh header
      filter-branch: use $SHELL_PATH instead of 'sh'
      filter-branch: don't use xargs -0
      add NO_EXTERNAL_GREP build option
      t6000lib: tr portability fix
      t4020: don't use grep -a
      add test_cmp function for test scripts
      remove use of "tail -n 1" and "tail -1"
      grep portability fix: don't use "-e" or "-q"
      more tr portability test script fixes
      t0050: perl portability fix
      tr portability fixes
  3. @gitster

    Merge branch 'py/submodule'

    gitster authored
    * py/submodule:
      git-submodule summary: fix that some "wc" flavors produce leading spaces
      git-submodule summary: test
      git-submodule summary: documentation
      git-submodule summary: limit summary size
      git-submodule summary: show commit summary
      git-submodule summary: code framework
  4. @gitster

    Merge branch 'db/diff-to-fp'

    gitster authored
    * db/diff-to-fp:
      wt-status.c: no need for dup() dance anymore
      Write diff output to a file in struct diff_options
  5. @gitster

    Merge branch 'cc/help'

    gitster authored
    * cc/help:
      Documentation/git-help: typofix
      help: warn if specified 'man.viewer' is unsupported, instead of erroring out
      Documentation: help: explain 'man.viewer' multiple values
      help: implement multi-valued "man.viewer" config option
      Documentation: help: describe 'man.viewer' config variable
      help: add "man.viewer" config var to use "woman" or "konqueror"
  6. @jonas @gitster

    shortlog: do not require to run from inside a git repository

    jonas authored gitster committed
    Once upon a time shortlog could be run from a non-git directory
    and still do its job. Fix this regression and add a small test
    for it.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      format-patch: generate MIME header as needed even when there is format.header
  8. @gitster

    format-patch: generate MIME header as needed even when there is forma…

    gitster authored
    …t.header
    
    Earlier, the callchain from pretty_print_commit() down to pp_title_line()
    had an unwarranted assumption that the presense of "after_subject"
    parameter, means the caller has already output MIME headers for
    attachments.  The parameter's primary purpose is to give extra header
    lines the caller wants to place after pp_title_line() generates the
    "Subject: " line.
    
    This assumption does not hold when the user used the format.header
    configuration variable to pass extra headers, and caused a message with
    non-ASCII character to lack proper MIME headers (e.g.  8-bit CTE header).
    The earlier logic also failed to suppress duplicated MIME headers when
    "format-patch -s --attach" is asked for and the signer's name demanded
    8-bit clean transport.
    
    This patch fixes the logic by introducing a separate need_8bit_cte
    parameter passed down the callchain.  This can have one of these values:
    
     -1 : we've already done MIME crap and we do not want to add extra header
          to say this is 8bit in pp_title_line();
    
      0 : we haven't done MIME and we have not seen anything that is 8bit yet;
    
      1 : we haven't done MIME and we have seen something that is 8bit;
          pp_title_line() must add MIME header.
    
    It adds two tests by Jeff King who independently diagnosed this issue.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Make man page building quiet when DOCBOOK_XSL_172 is defined
      git-new-workdir: Share SVN meta data between work dirs and the repository
      rev-parse: fix meaning of rev~ vs rev~0.
      git-svn: don't blindly append '*' to branch/tags config
  10. @jonas @gitster

    Make man page building quiet when DOCBOOK_XSL_172 is defined

    jonas authored gitster committed
    Tell xmlto to repress printing of the lines:
    
    	Note: meta date   : No date. Using generated date       git-xyx
    	Note: Writing git-xyz.1
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @gitster

    git-new-workdir: Share SVN meta data between work dirs and the reposi…

    Bernt Hansen authored gitster committed
    …tory
    
    Multiple work dirs with git svn caused each work dir to have its own
    stale copy of the SVN meta data in .git/svn
    
    git svn rebase updates commits with git-svn-id: in the repository and
    stores the SVN meta data information only in that work dir.  Attempting to
    git svn rebase in other work dirs for the same branch would fail because
    the last revision fetched according to the git-svn-id is greater than the
    revision in the SVN meta data for that work directory.
    
    Signed-off-by: Bernt Hansen <bernt@norang.ca>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @torvalds @gitster

    Fix recent 'unpack_trees()'-related changes breaking 'git stash'

    torvalds authored gitster committed
    On Sat, 15 Mar 2008, SZEDER G?bor wrote:
    >
    > The testcase usually fails during the first 25 run, but sometimes it
    > runs more than 100 times before failing.
    
    Damn, this series has had more subtle issues than I ever expected.
    
    'git stash' creates its saved working tree object with:
    
            # state of the working tree
            w_tree=$( (
                    rm -f "$TMP-index" &&
                    cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
                    GIT_INDEX_FILE="$TMP-index" &&
                    export GIT_INDEX_FILE &&
                    git read-tree -m $i_tree &&
                    git add -u &&
                    git write-tree &&
                    rm -f "$TMP-index"
            ) ) ||
                    die "Cannot save the current worktree state"
    
    which creates a new index file with the updates, and writes the tree from
    that.
    
    We have this logic where we compare the timestamp of the index with the
    timestamp of the files and we then write them out "smudged" if they are
    the same, and it basically depends on the fact that the date on the index
    file is compared with the date encoded in the stat information itself.
    
    And what is going on is:
    
     - we create a new index file with that "cp". We are careful to preserve
       the timestamps by using "-p", so this one should be all ok.
    
     - then we *update* that index by resetting it to the tree with git
       read-tree, but now we do *not* preserve the timestamp on this new copy
       any more, even though we copy over all the timestamps on the files that
       are indexed from the stat information!
    
    Now, we always had that problem when re-writing the index, but we had this
    clever workaround in the writing part: if the source had racily clean
    entries, then when we wrote those out (and thus can't depend on the index
    fiel timestamp showing that they are racily clean any more!), we would
    smudge them when writing.
    
    IOW, we handle this issue by having write_index() do this:
    
    	for (i = 0; i < entries; i++) {
    		...
    		if (is_racy_timestamp(istate, ce))
    			ce_smudge_racily_clean_entry(ce);
    		..
    
    when writing out entries. And that all took care of it, because now when
    we wrote the new index, we'd change the timestamp on the index, yes, but
    we'd smudge the entries we wrote out, so now the resulting index would
    still show that file as not-up-to-date any more.
    
    But with commit 34110cd ("Make
    'unpack_trees()' have a separate source and destination index"), this
    logic no longer triggers, because we now write out the "result" index, and
    that one never got its timestamp updated from the source index, so it had
    lost all that "is_racy_timestamp()" information!
    
    This trivial patch fixes it. It looks trivial, and it's a simple fix, but
    boy did it take me way too much thinking and explaining to myself to
    explain why there was a problem in the first place!
    
    The trivial fix is to just copy the index timestamp from the source index
    into the result index. But we only do this if we *have* a source index, of
    course, and if we will even bother to use the result.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @spearce

    git-gui: Adjusted Japanese translation to updated POT

    spearce authored
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  14. @spearce

    git-gui: Update Japanese translation

    しらいしななこ authored spearce committed
    I updated Japanese translation for the latest git-gui.
    
    Signed-off-by: しらいしななこ <nanako3@bluebottle.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  15. @spearce

    git-gui: Don't translate the special Apple menu

    spearce authored
    Peter Karlsson pointed out there is no value in translating the
    string "Apple", as this is used as the dummy label for the Apple
    menu on Mac OS X systems.
    
    The Apple menu is actually not the menu with the Apple corporate
    logo, but the menu next to it, which shows the name of the
    application and is typically called the application menu.  Most users
    of git-gui see this menu titled as "Git Gui".  The actual label of
    this menu comes from our Info.plist file and cannot be specified
    by any other means.  Translating this string in the Tcl PO files
    is not necessary.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  16. @spearce

    git-gui: Updated Hungarian translation (e5fba18)

    Miklos Vajna authored spearce committed
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  17. @raalkml @spearce

    git-gui: update russian translation

    raalkml authored spearce committed
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  18. @spearce

    git-gui: remove spurious "fuzzy" attributes in po/it.po

    Michele Ballabio authored spearce committed
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  19. @torvalds @gitster

    rev-parse: fix meaning of rev~ vs rev~0.

    torvalds authored gitster committed
    I think it would make more sense for rev~ to have the same guarantees that
    rev^ has, namely to always return a commit. I would also suggest that not
    giving a number would have the same effect of defaulting to 1, not 0.
    
    Right now it's a bit illogical, but at least it's an _undocumented_
    illogical behaviour.
    
    This patch makes '^' and '~' act the same for the default count (i.e. both
    default to 1), and also have the same behaviour for a count of zero.
    
    Before (no discernible pattern):
    
    	[torvalds@woody git]$ git rev-parse v1.5.1 v1.5.1^0 v1.5.1~0 v1.5.1^ v1.5.1~
    	45354a57ee7e3e42c7137db6c94fa968c6babe8d
    	89815ca
    	45354a57ee7e3e42c7137db6c94fa968c6babe8d
    	045f575
    	45354a57ee7e3e42c7137db6c94fa968c6babe8d
    
    After (fairly logical):
    
    	[torvalds@woody git]$ git rev-parse v1.5.1 v1.5.1^0 v1.5.1~0 v1.5.1^ v1.5.1~
    	45354a57ee7e3e42c7137db6c94fa968c6babe8d
    	89815ca
    	89815ca
    	045f575
    	045f575
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. @gitster

    git-svn: don't blindly append '*' to branch/tags config

    Eric Wong authored gitster committed
    Previously, git-svn would blindly append '*' even if it was specified by
    the user during initialization (for certain SVN setups, it is
    necessary).
    
    Now, the following command will work correctly:
    
      git svn init -T trunk/docutils \
                   -t 'tags/*/docutils' \
                   -b 'branches/*/docutils' \
                   svn://svn.berlios.de/docutils
    
    Thanks to martin f krafft for the bug report:
    > My git-svn target configuration is
    >
    >   [svn-remote "svn"]
    >     url = svn://svn.berlios.de/docutils
    >     fetch = trunk/docutils:refs/remotes/trunk
    >     branches = branches/*/docutils:refs/remotes/*
    >     tags = tags/*/docutils:refs/remotes/tags/*
    >
    > Unfortunately, when I run
    >
    >   git-svn init -T trunk/docutils -t 'tags/*/docutils'
    >    -b 'branches/*/docutils'
    >
    > then I get (note the two asterisks on the left hand side):
    >
    >     branches = branches/*/docutils/*:refs/remotes/*
    >     tags = tags/*/docutils/*:refs/remotes/tags/*
    >
    > I took a brief stab at the code but I can't even figure out where
    > the /* is appended, so I defer to you.
    >
    > It should be trivial to keep git-svn from appending /* if the left
    > side already contains an asterisk.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Tested-by: martin f krafft <madduck@madduck.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  21. @peff @gitster

    t6000lib: re-fix tr portability

    peff authored gitster committed
    It seems that some implementations of tr don't like a
    replacement string of '-----...'; they try to find the
    double-dash option "---...".
    
    Instead of this pipeline of tr and sed invocations, just use a
    single perl invocation.
    
    Signed-off-by: Jeff King <peff@peff.net>
  22. @gitster

    Merge git://git.kernel.org/pub/scm/gitk/gitk

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: initial Italian translation
      gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
      gitk: Avoid Tcl error when switching views
      [PATCH] gitk: Don't show local changes when we there is no work tree
      [PATCH] gitk: Add horizontal scrollbar to the diff view
      [PATCH] gitk: make autoselect optional
      [PATCH] gitk: Mark another string for translation
      [PATCH] Add an --argscmd flag to get the list of refs to show
      gitk: Only restore window size from ~/.gitk, not position
Commits on Mar 14, 2008
  1. @paulusmack

    gitk: initial Italian translation

    Michele Ballabio authored paulusmack committed
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  2. @paulusmack

    gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d

    paulusmack authored
    This is a similar change to that submitted by Junio C Hamano for
    git-gui.  It tests whether the msgfmt command can be run successfully
    with --tcl, -l and -d, and if not, falls back to using po/po2msg.sh.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  3. @gitster

    wt-status.c: no need for dup() dance anymore

    Kristian Høgsberg authored gitster committed
    Now we can generate diff to a file descriptor, we do not have to
    dup() the stdout around when writing the status output.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Write diff output to a file in struct diff_options

    Daniel Barkalow authored gitster committed
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @chriscool @gitster

    Documention: web--browse: add info about "browser.<tool>.cmd" config var

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