Skip to content
Commits on Apr 19, 2010
  1. @gitster

    Git 1.7.1-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 18, 2010
  2. @gitster

    Merge branch 'rr/remote-helper-doc'

    * rr/remote-helper-doc:
      Documentation/remote-helpers: Fix typos and improve language
      Fixup: Second argument may be any arbitrary string
      Documentation/remote-helpers: Add invocation section
      Documentation/urls: Rewrite to accomodate <transport>::<address>
      Documentation/remote-helpers: Rewrite description
    gitster committed Apr 18, 2010
  3. @gitster

    Merge branch 'wp/doc-filter-direction'

    * wp/doc-filter-direction:
      documentation: clarify direction of core.autocrlf
    gitster committed Apr 18, 2010
  4. @gitster

    Merge branch 'jk/maint-diffstat-overflow'

    * jk/maint-diffstat-overflow:
      diff: use large integers for diffstat calculations
    gitster committed Apr 18, 2010
  5. @gitster

    Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'

    * jg/auto-initialize-notes-with-percent-n-in-format:
      t3301: add tests to use --format="%N"
      pretty: Initialize notes if %N is used
    gitster committed Apr 18, 2010
  6. @gitster

    Merge branch 'maint'

    * maint:
      Documentation: Describe other situations where -z affects git diff
    gitster committed Apr 18, 2010
  7. @gitster

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

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Display dirty submodules correctly
      gitk: Fix display of copyright symbol
      gitk: Add emacs editor variable block
      gitk: Avoid calling tk_setPalette on Windows
      gitk: Don't clobber "Remember this view" setting
      gitk: Add comments to explain encode_view_opts and decode_view_opts
      gitk: Use consistent font for all text input fields
      gitk: Set the font for all listbox widgets
      gitk: Set the font for all spinbox widgets
      gitk: Remove forced use of sans-serif font
      gitk: Add Ctrl-W shortcut for closing the active window
    gitster committed Apr 18, 2010
Commits on Apr 18, 2010
  1. @artagnon @gitster

    Documentation/remote-helpers: Fix typos and improve language

    Fix some typos and errors in grammar and tense.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 18, 2010
  2. @artagnon @gitster

    Fixup: Second argument may be any arbitrary string

    This is intended to be a fixup for commit ad466d1 in pu. As Jonathan
    Neider pointed out, the second argument may be any arbitrary string,
    and need not conform to any URL-like shape.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 18, 2010
  3. @artagnon @gitster

    Documentation/remote-helpers: Add invocation section

    Add an 'Invocation' section to specify what the command line arguments
    mean. Also include a link to git-remote in the 'See Also' section.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 7, 2010
  4. @artagnon @gitster

    Documentation/urls: Rewrite to accomodate <transport>::<address>

    Rewrite the first part of the document to explicitly show differences
    between the URLs that can be used with different transport
    protocols. Mention <transport>::<address> format to explicitly invoke
    a remote helper.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 6, 2010
  5. @artagnon @gitster

    Documentation/remote-helpers: Rewrite description

    Rewrite the description section to describe what exactly remote
    helpers are and the need for them. Also mention the curl family of
    remote helpers as an example.
    
    [jc: with readability fixes from Jonathan squashed in]
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Mar 28, 2010
  6. @hashpling @gitster

    Documentation: Describe other situations where -z affects git diff

    -z also alters the behaviour of --name-only and --name-status.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    hashpling committed with gitster Apr 18, 2010
  7. @peff @gitster

    rebase-interactive: silence warning when no commits rewritten

    If you do a "rebase -i" and don't change any commits,
    nothing is rewritten, and we have no REWRITTEN_LIST. The
    shell prints out an ugly message:
    
      $ GIT_EDITOR=true git rebase -i HEAD^
      /path/to/git-rebase--interactive: 1: cannot open
        /path/to/repo/.git/rebase-merge/rewritten-list: No such file
      Successfully rebased and updated refs/heads/master.
    
    We can fix it by not running "notes copy" at all if nothing
    was rewritten.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Apr 18, 2010
  8. @gitster

    t3301: add tests to use --format="%N"

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 18, 2010
Commits on Apr 17, 2010
  1. @gitster

    Merge branch 'maint'

    * maint:
      t1010-mktree: Adjust expected result to code and documentation
      combined diff: correctly handle truncated file
      Document new "already-merged" rule for branch -d
    gitster committed Apr 17, 2010
  2. @gitster

    t6006: do not write to /tmp

    Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Matthew Ogilvie committed with gitster Apr 16, 2010
  3. @arachsys @gitster

    git-instaweb: pass through invoking user's path to gitweb CGI scripts

    When used with lighttpd or mongoose, git-instaweb previously passed a
    hard-coded, default value of PATH to the gitweb CGI script. Use the invoking
    user's value for PATH for this instead. (This is already implicitly the
    behaviour for other web servers supported by git-instaweb.)
    
    Signed-off-by: Chris Webb <chris@arachsys.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    arachsys committed with gitster Apr 15, 2010
  4. @gitster

    gitweb: simplify gitweb.min.* generation and clean-up rules

    GITWEB_CSS and GITWEB_JS are meant to be "what URI should the installed
    cgi script use to refer to the stylesheet and JavaScript", never "this
    is the name of the file we are building".  Don't use them to decide what
    file to build minified versions in.
    
    While we are at it, lose FILES that is used only for "clean" target in a
    misguided way.  "make clean" should try to remove all the potential
    build artifacts regardless of a minor configuration change. Instead of
    trying to remove only the build product "make clean" would have created
    if it were run without "clean", explicitly list the three potential build
    products for removal.
    
    Tested-by: Mark Rada <marada@uwaterloo.co>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 15, 2010
  5. @jrn @gitster

    tag -v: use RUN_GIT_CMD to run verify-tag

    This is the preferred way to run a git command.
    
    The only obvious observable effects I can think of are that the exec
    is properly reported in GIT_TRACE output and that verifying signed
    tags will still work if the git-verify-tag hard link in gitexecdir
    goes missing.
    
    Helped-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 15, 2010
  6. @wpalmer @gitster

    documentation: clarify direction of core.autocrlf

    The description for core.autocrlf refers to reads from / writes to
    "the filesystem", the only use of this rather ambiguous term, which
    technically could be referring to the git object database. (All other
    mentions are part of phrases such as "..filesystems (like NFS)..").
    
    Other sections, including the section on core.safecrlf, use the term
    "work tree" for the same purpose as the term "the filesystem" is used in
    the core.autocrlf section, so that seems like a good alternative, which
    makes it clearer what direction the addition/removal of CR characters
    occurs in.
    
    Signed-off-by: Will Palmer <wmpalmer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wpalmer committed with gitster Apr 17, 2010
  7. @peff @gitster

    diff: use large integers for diffstat calculations

    The diffstat "added" and "changed" fields generally store
    line counts; however, for binary files, they store file
    sizes. Since we store and print these values as ints, a
    diffstat on a file larger than 2G can show a negative size.
    Instead, let's use uintmax_t, which should be at least 64
    bits on modern platforms.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Apr 17, 2010
  8. @mjg @gitster

    t1010-mktree: Adjust expected result to code and documentation

    The last two tests here were always supposed to fail in the sense
    that, according to code and documentation, mktree should read non-recursive
    ls-tree output, but not recursive one, and therefore explicitely refuses
    to deal with slashes.
    
    Adjust the test (must_fail) so that it succeeds when mktree dies on
    slashes.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 15, 2010
  9. @trast @gitster

    combined diff: correctly handle truncated file

    Consider an evil merge of two commits A and B, both of which have a
    file 'foo', but the merge result does not have that file.
    
    The combined-diff code learned in 4462731 (combine-diff: do not punt
    on removed or added files., 2006-02-06) to concisely show only the
    removal, since that is the evil part and the previous contents are
    presumably uninteresting.
    
    However, to diagnose an empty merge result, it overloaded the variable
    that holds the file's length.  This means that the check also triggers
    for truncated files.  Consequently, such files were not shown in the
    diff at all despite the merge being clearly evil.
    
    Fix this by adding a new variable that distinguishes whether the file
    was deleted (which is the case 4462731 handled) or truncated.  In the
    truncated case, we show the full combined diff again, which is rather
    spammy but at least does not hide the evilness.
    
    Reported-by: David Martínez Martí <desarrollo@gestiweb.com>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Apr 15, 2010
  10. @jlehmann @paulusmack

    gitk: Display dirty submodules correctly

    Since recently "git diff --submodule" prints out extra lines when the
    submodule contains untracked or modified files. Show all those lines of
    one submodule under the same header.
    
    Also for newly added or removed submodules the submodule name contained
    trailing garbage because the extraction of the name was not done right.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    jlehmann committed with paulusmack Apr 9, 2010
Commits on Apr 15, 2010
  1. @jrn @gitster

    Document new "already-merged" rule for branch -d

    v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the
    branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic
    for when it is safe to delete a branch without forcing the issue.  It
    is safe to delete a branch "topic" without second thought if:
    
     - the branch "topic" is set up to pull from a (remote-tracking,
       usually) branch and is fully merged in that "upstream" branch, or
    
     - there is no branch.topic.merge configuration and branch "topic" is
       fully merged in the current HEAD.
    
    Update the man page to acknowledge the new rules.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 15, 2010
  2. @jrn @gitster

    Add .depend directories to .gitignore

    The makefile snippets that would land in these directories are already
    being ignored.  Ignore the directories instead so they don’t show up
    in ‘git clean -n’ output.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 15, 2010
Commits on Apr 14, 2010
  1. @gitster

    Merge branch 'maint'

    * maint:
      Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
      Docs: Add -X option to git-merge's synopsis.
    
    Conflicts:
    	Documentation/merge-options.txt
    gitster committed Apr 13, 2010
  2. @heipei @gitster

    pretty: Initialize notes if %N is used

    When using git log --pretty='%N' without an explicit --show-notes, git
    would segfault. This patches fixes this behaviour by loading the needed
    notes datastructures if --pretty is used and the format contains %N.
    When --pretty='%N' is used together with --no-notes, %N won't be
    expanded.
    
    This is an extension to a proposed patch by Jeff King.
    
    Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    heipei committed with gitster Apr 13, 2010
Commits on Apr 13, 2010
  1. @jaysoffian @gitster

    Documentation/config.txt: default gc.aggressiveWindow is 250, not 10

    The default for gc.aggressiveWindow has been 250 since 1c192f3
    (gc --aggressive: make it really aggressive, 2007-12-06).
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaysoffian committed with gitster Apr 13, 2010
Commits on Apr 12, 2010
  1. @marcnarc @gitster

    Docs: Add -X option to git-merge's synopsis.

    Also move -X's description next to -s's in merge-options.txt.
    
    This makes it easier to learn how to specify merge strategy options.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcnarc committed with gitster Apr 12, 2010
Commits on Apr 11, 2010
  1. @gitster

    Merge branch 'jl/maint-submodule-gitfile-awareness'

    * jl/maint-submodule-gitfile-awareness:
      Windows: start_command: Support non-NULL dir in struct child_process
    gitster committed Apr 11, 2010
  2. @j6t @gitster

    Windows: start_command: Support non-NULL dir in struct child_process

    A caller of start_command can set the member 'dir' to a directory to
    request that the child process starts with that directory as CWD. The first
    user of this feature was added recently in eee49b6 (Teach diff --submodule
    and status to handle .git files in submodules).
    
    On Windows, we have been lazy and had not implemented support for this
    feature, yet. This fixes the shortcoming.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Apr 11, 2010
  3. @gitster

    Sync with 1.7.0.5

    gitster committed Apr 11, 2010
  4. @gitster

    Merge branch 'jc/doc-submit-gmail'

    * jc/doc-submit-gmail:
      SubmittingPatches: update GMail section
    gitster committed Apr 11, 2010
Something went wrong with that request. Please try again.