Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Feb 01, 2012

  1. Junio C Hamano

    Update draft release notes to 1.7.10

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

    Merge branch 'tr/merge-edit-guidance'

    * tr/merge-edit-guidance:
      merge: add instructions to the commit message when editing
    authored January 31, 2012
  3. Junio C Hamano

    Merge branch 'jc/pull-signed-tag'

    * jc/pull-signed-tag:
      merge: use editor by default in interactive sessions
    
    Conflicts:
    	Documentation/merge-options.txt
    authored January 31, 2012
  4. Junio C Hamano

    Merge branch 'ar/i18n-no-gettext'

    * ar/i18n-no-gettext:
      i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
      i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
      add a Makefile switch to avoid gettext translation in shell scripts
      git-sh-i18n: restructure the logic to compute gettext.sh scheme
    authored January 31, 2012
  5. Junio C Hamano

    Merge branch 'nd/clone-detached'

    * nd/clone-detached:
      clone: fix up delay cloning conditions
      push: do not let configured foreign-vcs permanently clobbered
      clone: print advice on checking out detached HEAD
      clone: allow --branch to take a tag
      clone: refuse to clone if --branch points to bogus ref
      clone: --branch=<branch> always means refs/heads/<branch>
      clone: delay cloning until after remote HEAD checking
      clone: factor out remote ref writing
      clone: factor out HEAD update code
      clone: factor out checkout code
      clone: write detached HEAD in bare repositories
      t5601: add missing && cascade
    authored January 31, 2012
  6. Junio C Hamano

    Merge branch 'da/maint-mergetool-twoway'

    * da/maint-mergetool-twoway:
      mergetool: Provide an empty file when needed
    authored January 31, 2012
  7. Junio C Hamano

    Merge branch 'va/git-p4-branch'

    * va/git-p4-branch:
      t9801: do not overuse test_must_fail
      git-p4: Change p4 command invocation
      git-p4: Add test case for complex branch import
      git-p4: Search for parent commit on branch creation
    authored January 31, 2012
  8. Junio C Hamano

    Merge branch 'jl/submodule-re-add'

    * jl/submodule-re-add:
      submodule add: fix breakage when re-adding a deep submodule
    authored January 31, 2012
  9. Junio C Hamano

    Merge branch 'tr/grep-l-with-decoration'

    * tr/grep-l-with-decoration:
      grep: fix -l/-L interaction with decoration lines
    authored January 31, 2012
  10. Junio C Hamano

    Merge branch 'ks/sort-wildcard-in-makefile'

    * ks/sort-wildcard-in-makefile:
      t/Makefile: Use $(sort ...) explicitly where needed
    authored January 31, 2012
  11. Junio C Hamano

    Merge branch 'ld/git-p4-branches-and-labels'

    * ld/git-p4-branches-and-labels:
      git-p4: label import fails with multiple labels at the same changelist
      git-p4: add test for p4 labels
      git-p4: importing labels should cope with missing owner
      git-p4: cope with labels with empty descriptions
      git-p4: handle p4 branches and labels containing shell chars
    authored January 31, 2012
  12. Junio C Hamano

    Merge branch 'rr/sequencer'

    * rr/sequencer:
      sequencer: factor code out of revert builtin
      revert: prepare to move replay_action to header
    
    Conflicts:
    	builtin/revert.c
    authored January 31, 2012
  13. Junio C Hamano

    Merge branch 'jc/advise-i18n'

    * jc/advise-i18n:
      i18n of multi-line advice messages
    authored January 31, 2012

Jan 31, 2012

  1. trast

    merge: add instructions to the commit message when editing

    Before f824628 (merge: use editor by default in interactive sessions,
    2012-01-10), git-merge only started an editor if the user explicitly
    asked for it with --edit.  Thus it seemed unlikely that the user would
    need extra guidance.
    
    After f824628 the _normal_ thing is to start an editor.  Give at least
    an indication of why we are doing it.
    
    The sentence about justification is one of the few things about
    standard git that are not agnostic to the workflow that the user
    chose.  However, f824628 was proposed by Linus specifically to
    discourage users from merging unrelated upstream progress into topic
    branches.  So we may as well take another step in the same direction.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 30, 2012 gitster committed January 31, 2012

Jan 30, 2012

  1. Adrian

    completion: --edit and --no-edit for git-merge

    Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 30, 2012 gitster committed January 30, 2012

Jan 29, 2012

  1. Junio C Hamano

    Kick off the post 1.7.9 cycle

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

    Merge branch 'nd/index-pack-no-recurse'

    * nd/index-pack-no-recurse:
      index-pack: eliminate unlimited recursion in get_base_data()
      index-pack: eliminate recursion in find_unresolved_deltas
      Eliminate recursion in setting/clearing marks in commit list
    authored January 29, 2012
  3. Junio C Hamano

    Merge branch 'rs/diff-postimage-in-context'

    * rs/diff-postimage-in-context:
      xdiff: print post-image for common records instead of pre-image
    authored January 29, 2012
  4. Junio C Hamano

    Merge branch 'jk/parse-object-cached'

    * jk/parse-object-cached:
      upload-pack: avoid parsing tag destinations
      upload-pack: avoid parsing objects during ref advertisement
      parse_object: try internal cache before reading object db
    authored January 29, 2012
  5. Junio C Hamano

    Merge branch 'sp/smart-http-failure-to-push'

    * sp/smart-http-failure-to-push:
      remote-curl: Fix push status report when all branches fail
    authored January 29, 2012
  6. Junio C Hamano

    Merge branch 'jc/maint-log-first-parent-pathspec'

    * jc/maint-log-first-parent-pathspec:
      Making pathspec limited log play nicer with --first-parent
    authored January 29, 2012
  7. Junio C Hamano

    Merge branch 'mh/ref-clone-without-extra-refs'

    * mh/ref-clone-without-extra-refs:
      write_remote_refs(): create packed (rather than extra) refs
      add_packed_ref(): new function in the refs API.
      ref_array: keep track of whether references are sorted
      pack_refs(): remove redundant check
    authored January 29, 2012
  8. Junio C Hamano

    Merge branch 'jl/test-pause'

    * jl/test-pause:
      test-lib: add the test_pause convenience function
    authored January 29, 2012
  9. Junio C Hamano

    Merge branch 'tr/maint-mailinfo'

    * tr/maint-mailinfo:
      mailinfo: with -b, keep space after [foo]
      am: learn passing -b to mailinfo
    
    Conflicts:
    	git-am.sh
    authored January 29, 2012
  10. Junio C Hamano

    Merge branch 'pw/p4-view-updates'

    * pw/p4-view-updates:
      git-p4: add tests demonstrating spec overlay ambiguities
      git-p4: adjust test to adhere to stricter useClientSpec
      git-p4: clarify comment
      git-p4: fix verbose comment typo
      git-p4: only a single ... wildcard is supported
    authored January 29, 2012
  11. Junio C Hamano

    Merge branch 'nd/maint-refname-in-hierarchy-check'

    * nd/maint-refname-in-hierarchy-check:
      Fix incorrect ref namespace check
    authored January 29, 2012
  12. Junio C Hamano

    Merge branch 'jn/gitweb-unspecified-action'

    * jn/gitweb-unspecified-action:
      gitweb: Fix actionless dispatch for non-existent objects
    authored January 29, 2012
  13. Junio C Hamano

    Merge branch 'cb/push-quiet'

    * cb/push-quiet:
      t5541: avoid TAP test miscounting
      fix push --quiet: add 'quiet' capability to receive-pack
      server_supports(): parse feature list more carefully
    authored January 29, 2012
  14. Junio C Hamano

    Merge branch 'nd/clone-single-branch'

    * nd/clone-single-branch:
      clone: add --single-branch to fetch only one branch
    authored January 29, 2012
  15. Junio C Hamano

    Merge branch 'cb/git-daemon-tests'

    * cb/git-daemon-tests:
      git-daemon tests: wait until daemon is ready
      git-daemon: produce output when ready
      git-daemon: add tests
    authored January 29, 2012
  16. Junio C Hamano

    Merge branch 'cb/maint-kill-subprocess-upon-signal'

    * cb/maint-kill-subprocess-upon-signal:
      dashed externals: kill children on exit
      run-command: optionally kill children on exit
    authored January 29, 2012

Jan 27, 2012

  1. Junio C Hamano

    Git 1.7.9

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

    i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT

    It should merely be the default used when the builder does not say
    anything about USE_GETTEXT_SCHEME.
    
    Even with NO_GETTEXT, USE_GETTEXT_SCHEME=gnu may be a way to avoid
    possibly slower emulation in our shell scripts.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 23, 2012
  3. Junio C Hamano

    INSTALL: warn about recent Fedora breakage

    Recent releases of Redhat/Fedora are reported to ship Perl binary package
    with some core modules stripped away (see http://lwn.net/Articles/477234/)
    against the upstream Perl5 people's wishes. The Time::HiRes module used by
    gitweb one of them.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 26, 2012

Jan 26, 2012

  1. Felipe Contreras

    git-completion: workaround zsh COMPREPLY bug

    zsh adds a backslash (foo\ ) for each item in the COMPREPLY array if IFS
    doesn't contain spaces. This issue has been reported[1], but there is no
    solution yet.
    
    This wasn't a problem due to another bug[2], which was fixed in zsh
    version 4.3.12. After this change, 'git checkout ma<tab>' would resolve
    to 'git checkout master\ '.
    
    Aditionally, the introduction of __gitcomp_nl in commit a31e626
    (completion: optimize refs completion) in git also made the problem
    apparent, as Matthieu Moy reported.
    
    The simplest and most generic solution is to hide all the changes we do
    to IFS, so that "foo \nbar " is recognized by zsh as "foo bar". This
    works on versions of git before and after the introduction of
    __gitcomp_nl (a31e626), and versions of zsh before and after 4.3.12.
    
    Once zsh is fixed, we should conditionally disable this workaround to
    have the same benefits as bash users.
    
    [1] http://www.zsh.org/mla/workers/2012/msg00053.html
    [2] http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=commitdiff;h=2e25dfb8fd38dbef0a306282ffab1d343ce3ad8d
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored January 25, 2012 gitster committed January 26, 2012
Something went wrong with that request. Please try again.