Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: next

Apr 22, 2014

  1. Junio C Hamano

    Merge branch 'fc/merge-default-to-upstream' into next

    * fc/merge-default-to-upstream:
      merge: enable defaulttoupstream by default
    authored April 22, 2014
  2. Junio C Hamano

    Merge branch 'fc/mergetool-prompt' into next

    * fc/mergetool-prompt:
      mergetool: run prompt only if guessed tool
    authored April 22, 2014
  3. Junio C Hamano

    Merge branch 'fc/mergetools-vimdiff3' into next

    * fc/mergetools-vimdiff3:
      mergetools: add vimdiff3 mode
    authored April 22, 2014
  4. Felipe Contreras

    merge: enable defaulttoupstream by default

    There's no point in this:
    
    % git merge
    fatal: No commit specified and merge.defaultToUpstream not set.
    
    We know the most likely scenario is that the user wants to merge the
    upstream, and if not, he can set merge.defaultToUpstream to false.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 20, 2014 gitster committed April 22, 2014
  5. Felipe Contreras

    mergetool: run prompt only if guessed tool

    It's annoying to see the prompt:
    
      Hit return to start merge resolution tool (foo):
    
    Every time the user does 'git mergetool' even if the user already
    configured 'foo' as the wanted tool.
    
    Display this prompt only when the user hasn't explicitly configured a
    tool.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 20, 2014 gitster committed April 22, 2014
  6. Felipe Contreras

    mergetools: add vimdiff3 mode

    It's similar to the default, except that the other windows are hidden.
    This ensures that removed/added colors are still visible on the main
    merge window, but the other windows not visible.
    
    Specially useful with merge.conflictstyle=diff3.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 20, 2014 gitster committed April 22, 2014

Apr 21, 2014

  1. Junio C Hamano

    Merge branch 'rs/ref-update-check-errors-early' into next

    * rs/ref-update-check-errors-early:
      commit.c: check for lock error and return early
      sequencer.c: check for lock failure and bail early in fast_forward_to
    authored April 21, 2014
  2. Junio C Hamano

    Merge branch 'sk/svn-parse-datestamp' into next

    * sk/svn-parse-datestamp:
      SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
    authored April 21, 2014
  3. Junio C Hamano

    Merge branch 'ef/send-email-absolute-path-to-the-command' into next

    * ef/send-email-absolute-path-to-the-command:
      send-email: recognize absolute path on Windows
    authored April 21, 2014
  4. Junio C Hamano

    Merge branch 'master' into next

    * master:
      Update draft release notes to 2.0
      Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
    authored April 21, 2014
  5. Junio C Hamano

    Merge branch 'fc/transport-helper-sync-error-fix' into next

    Make sure the marks are not written out when the transport helper
    did not finish happily, to avoid marks file that is out of sync
    with the reality.
    
    * fc/transport-helper-sync-error-fix:
      t5801 (remote-helpers): cleanup environment sets
      transport-helper: fix sync issue on crashes
      transport-helper: trivial cleanup
      transport-helper: propagate recvline() error pushing
      remote-helpers: make recvline return an error
      transport-helper: remove barely used xchgline()
    authored April 21, 2014
  6. Junio C Hamano

    Update draft release notes to 2.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 21, 2014
  7. Junio C Hamano

    Merge git://bogomips.org/git-svn

    * git://bogomips.org/git-svn:
      Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
    authored April 21, 2014
  8. Junio C Hamano

    Merge branch 'jx/i18n'

    * jx/i18n:
      i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines
      i18n: only extract comments marked with "TRANSLATORS:"
      i18n: remove obsolete comments for translators in diffstat generation
      i18n: fix uncatchable comments for translators in date.c
    authored April 21, 2014
  9. Junio C Hamano

    Merge branch 'km/avoid-non-function-return-in-rebase'

    Work around /bin/sh that does not like "return" at the top-level
    of a file that is dot-sourced from inside a function definition.
    
    * km/avoid-non-function-return-in-rebase:
      Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
      rebase: avoid non-function use of "return" on FreeBSD
    authored April 21, 2014
  10. Junio C Hamano

    Merge branch 'ep/shell-command-substitution'

    * ep/shell-command-substitution:
      t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
      t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
      git-tag.sh: use the $( ... ) construct for command substitution
      git-revert.sh: use the $( ... ) construct for command substitution
      git-resolve.sh: use the $( ... ) construct for command substitution
      git-repack.sh: use the $( ... ) construct for command substitution
      git-merge.sh: use the $( ... ) construct for command substitution
      git-ls-remote.sh: use the $( ... ) construct for command substitution
      git-fetch.sh: use the $( ... ) construct for command substitution
      git-commit.sh: use the $( ... ) construct for command substitution
      git-clone.sh: use the $( ... ) construct for command substitution
      git-checkout.sh: use the $( ... ) construct for command substitution
      install-webdoc.sh: use the $( ... ) construct for command substitution
      howto-index.sh: use the $( ... ) construct for command substitution
    authored April 21, 2014
  11. Felipe Contreras

    t5801 (remote-helpers): cleanup environment sets

    Commit 512477b (tests: use "env" to run commands with temporary env-var
    settings) missed some variables in the remote-helpers test. Also
    standardize these.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 20, 2014 gitster committed April 21, 2014

Apr 19, 2014

  1. Johan Herland

    Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not g…

    …iven
    
    git-svn by default puts its Subversion-tracking refs directly in
    refs/remotes/*. This runs counter to Git's convention of using
    refs/remotes/$remote/* for storing remote-tracking branches.
    
    Furthermore, combining git-svn with regular git remotes run the risk of
    clobbering refs under refs/remotes (e.g. if you have a git remote
    called "tags" with a "v1" branch, it will overlap with the git-svn's
    tracking branch for the "v1" tag from Subversion.
    
    Even though the git-svn refs stored in refs/remotes/* are not "proper"
    remote-tracking branches (since they are not covered by a proper git
    remote's refspec), they clearly represent a similar concept, and would
    benefit from following the same convention.
    
    For example, if git-svn tracks Subversion branch "foo" at
    refs/remotes/foo, and you create a local branch refs/heads/foo to add
    some commits to be pushed back to Subversion (using "git svn dcommit),
    then it is clearly unhelpful of Git to throw
    
      warning: refname 'foo' is ambiguous.
    
    every time you checkout, rebase, or otherwise interact with the branch.
    
    The existing workaround for this is to supply the --prefix=quux/ to
    git svn init/clone, so that git-svn's tracking branches end up in
    refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
    users to specify --prefix to work around a design flaw in git-svn is
    suboptimal, and not a long term solution to the problem. Instead,
    git-svn should default to use a non-empty prefix that saves
    unsuspecting users from the inconveniences described above.
    
    This patch will only affect newly created git-svn setups, as the
    --prefix option only applies to git svn init (and git svn clone).
    Existing git-svn setups will continue with their existing (lack of)
    prefix. Also, if anyone somehow prefers git-svn's old layout, they
    can recreate that by explicitly passing an empty prefix (--prefix "")
    on the git svn init/clone command line.
    
    The patch changes the default value for --prefix from "" to "origin/",
    updates the git-svn manual page, and fixes the fallout in the git-svn
    testcases.
    
    (Note that this patch might be easier to review using the --word-diff
    and --word-diff-regex=. diff options.)
    
    [ew: squashed description of <= 1.9 behavior into manpage]
    
    Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    authored October 11, 2013 Eric Wong committed April 19, 2014

Apr 18, 2014

  1. Junio C Hamano

    Merge branch 'master' into next

    * master:
      Git 2.0-rc0
    authored April 18, 2014
  2. Junio C Hamano

    Merge branch 'jx/i18n' into next

    * jx/i18n:
      i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines
      i18n: only extract comments marked with "TRANSLATORS:"
      i18n: remove obsolete comments for translators in diffstat generation
      i18n: fix uncatchable comments for translators in date.c
    authored April 18, 2014
  3. Junio C Hamano

    Merge branch 'km/avoid-non-function-return-in-rebase' into next

    Work around /bin/sh that does not like "return" at the top-level
    of a file that is dot-sourced from inside a function definition.
    
    * km/avoid-non-function-return-in-rebase:
      Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
      rebase: avoid non-function use of "return" on FreeBSD
    authored April 18, 2014
  4. Junio C Hamano

    Merge branch 'ep/shell-command-substitution' into next

    * ep/shell-command-substitution:
      t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
      t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
      git-tag.sh: use the $( ... ) construct for command substitution
      git-revert.sh: use the $( ... ) construct for command substitution
      git-resolve.sh: use the $( ... ) construct for command substitution
      git-repack.sh: use the $( ... ) construct for command substitution
      git-merge.sh: use the $( ... ) construct for command substitution
      git-ls-remote.sh: use the $( ... ) construct for command substitution
      git-fetch.sh: use the $( ... ) construct for command substitution
      git-commit.sh: use the $( ... ) construct for command substitution
      git-clone.sh: use the $( ... ) construct for command substitution
      git-checkout.sh: use the $( ... ) construct for command substitution
      install-webdoc.sh: use the $( ... ) construct for command substitution
      howto-index.sh: use the $( ... ) construct for command substitution
    authored April 18, 2014
  5. Junio C Hamano

    Git 2.0-rc0

    An early-preview for the upcoming Git 2.0.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 18, 2014
  6. Junio C Hamano

    Merge branch 'jk/config-die-bad-number-noreturn'

    Squelch a false compiler warning from older gcc.
    
    * jk/config-die-bad-number-noreturn:
      config.c: mark die_bad_number as NORETURN
    authored April 18, 2014
  7. Junio C Hamano

    Merge branch 'fc/remote-helper-fixes'

    * fc/remote-helper-fixes:
      remote-bzr: trivial test fix
      remote-bzr: include authors field in pushed commits
      remote-bzr: add support for older versions
      remote-hg: always normalize paths
      remote-helpers: allow all tests running from any dir
    authored April 18, 2014
  8. Junio C Hamano

    Merge branch 'fc/complete-aliased-push'

    * fc/complete-aliased-push:
      completion: fix completing args of aliased "push", "fetch", etc.
    authored April 18, 2014
  9. Junio C Hamano

    Merge branch 'fc/prompt-zsh-read-from-file'

    * fc/prompt-zsh-read-from-file:
      prompt: fix missing file errors in zsh
    authored April 18, 2014
  10. Junio C Hamano

    i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines

    These comments have to have "TRANSLATORS: " at the very beginning
    and have to deviate from the usual multi-line comment formatting
    convention.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 18, 2014

Apr 17, 2014

  1. rsahlberg

    commit.c: check for lock error and return early

    Move the check for the lock failure to happen immediately after
    lock_any_ref_for_update().  Previously the lock and the
    check-if-lock-failed was separated by a handful of string
    manipulation statements.
    
    Moving the check to occur immediately after the failed lock makes
    the code slightly easier to read and makes it follow the pattern of
    
     try-to-take-a-lock();
     if (check-if-lock-failed) {
        error();
     }
    
    Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  2. rsahlberg

    sequencer.c: check for lock failure and bail early in fast_forward_to

    Change fast_forward_to() to check if locking the ref failed, print a
    nice error message and bail out early.
    
    The old code did not check if ref_lock was NULL and relied on the
    fact that the write_ref_sha1() would safely detect this condition
    and set the return variable ret to indicate an error.
    
    While that is safe, it makes the code harder to read for two reasons:
    
     * Inconsistency.  Almost all other places we do check the lock for
       NULL explicitly, so the naive reader is confused "why don't we
       check here?"
    
     * And relying on write_ref_sha1() to detect and return an error for
       when a previous lock_any_ref_for_update() failed feels obfuscated.
    
    This change should not change any functionality or logic aside from
    adding an extra error message when this condition is triggered
    (write_ref_sha1() returns an error silently for this condition).
    
    Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  3. t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command subst…

    …itution
    
    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  4. t9360-mw-to-git-clone.sh: use the $( ... ) construct for command subs…

    …titution
    
    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  5. git-tag.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  6. git-revert.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  7. git-resolve.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
Something went wrong with that request. Please try again.