Permalink
Commits on Nov 13, 2011
  1. Git 1.7.8-rc2

    gitster committed Nov 13, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 12, 2011
  1. Merge branch 'ly/mktree-using-strbuf'

    gitster committed Nov 12, 2011
    * ly/mktree-using-strbuf:
      mktree: fix a memory leak in write_tree()
Commits on Nov 10, 2011
  1. Merge 'build-in git-mktree'

    gitster committed Nov 10, 2011
    * commit '633e3556ccbc': (5835 commits)
      build-in git-mktree
      allow -t abbreviation for --track in git branch
      gitweb: Remove function prototypes (cleanup)
      Documentation: cloning to empty directory is allowed
      Clarify kind of conflict in merge-one-file helper
      git config: clarify --add and --get-color
      archive-tar.c: squelch a type mismatch warning
      Start 1.6.4 development
      Start 1.6.3.1 maintenance series.
      GIT 1.6.3
      t4029: use sh instead of bash
      t4200: convert sed expression which operates on non-text file to perl
      t4200: remove two unnecessary lines
      t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
      t4118: avoid sed invocation on file without terminating newline
      t4118: add missing '&&'
      t8005: use egrep when extended regular expressions are required
      git-clean doc: the command only affects paths under $(cwd)
      improve error message in config.c
      t4018-diff-funcname: add cpp xfuncname pattern to syntax test
      ...
  2. mktree: fix a memory leak in write_tree()

    liuy committed with gitster Nov 10, 2011
    We forget to call strbuf_release to release the buf memory.
    
    Signed-off-by: Liu Yuan <tailai.ly@taobao.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 9, 2011
  1. Merge branch 'sn/complete-bash-wo-process-subst'

    gitster committed Nov 9, 2011
    * sn/complete-bash-wo-process-subst:
      completion: don't leak variable from the prompt into environment
  2. completion: don't leak variable from the prompt into environment

    szeder committed with gitster Nov 9, 2011
    Commit e5b8eeb (completion: fix issue with process substitution not
    working on Git for Windows, 2011-10-26) introduced a new variable in
    __git_ps1_show_upstream(), but didn't declare it as local to prevent it
    from leaking into the environment.
    
    We may want to rewrite it like the following, but that can wait until the
    next cycle.
    
    	while read key value
    	do
    		...
    	done <<-EOF
    	$(git config -z --get-regexp ...)
    	EOF
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Update draft release notes to 1.7.8

    gitster committed Nov 9, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'jc/remote-setbranches-usage-fix'

    gitster committed Nov 9, 2011
    * jc/remote-setbranches-usage-fix:
      remote: fix set-branches usage
  5. Merge branch 'fc/remote-seturl-usage-fix'

    gitster committed Nov 9, 2011
    * fc/remote-seturl-usage-fix:
      remote: fix remote set-url usage
  6. Sync with 1.7.7.3

    gitster committed Nov 9, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Git 1.7.7.3

    gitster committed Nov 9, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Merge branch 'jc/maint-remove-renamed-ref' into maint

    gitster committed Nov 9, 2011
    * jc/maint-remove-renamed-ref:
      branch -m/-M: remove undocumented RENAMED-REF
    
    Conflicts:
    	refs.c
  9. Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint

    gitster committed Nov 9, 2011
    * jm/maint-gitweb-filter-forks-fix:
      gitweb: fix regression when filtering out forks
  10. Merge branch 'dm/pack-objects-update' into maint

    gitster committed Nov 9, 2011
    * dm/pack-objects-update:
      pack-objects: don't traverse objects unnecessarily
      pack-objects: rewrite add_descendants_to_write_order() iteratively
      pack-objects: use unsigned int for counter and offset values
      pack-objects: mark add_to_write_order() as inline
Commits on Nov 8, 2011
  1. docs: Update install-doc-quick

    gitster committed Nov 8, 2011
    The preformatted documentation pages live in their own repositories
    these days. Adjust the installation procedure to the updated layout.
    
    Tested-by: Stefan Naewe <stefan.naewe@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. docs: don't mention --quiet or --exit-code in git-log(1)

    peff committed with gitster Nov 8, 2011
    These are diff-options, but they don't actually make sense
    in the context of log.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Git 1.7.8-rc1

    gitster committed Nov 8, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'ss/blame-textconv-fake-working-tree'

    gitster committed Nov 8, 2011
    * ss/blame-textconv-fake-working-tree:
      blame.c: Properly initialize strbuf after calling textconv_object(), again
  5. blame.c: Properly initialize strbuf after calling textconv_object(), …

    sschuberth committed with gitster Nov 7, 2011
    …again
    
    
    2564aa4 started to initialize buf.alloc, but that should actually be one
    more byte than the string length due to the trailing \0. Also, do not
    modify buf.alloc out of the strbuf code. Use the existing strbuf_attach
    instead.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Reviewed-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 7, 2011
  1. Merge branch 'ab/i18n-test-fix'

    gitster committed Nov 7, 2011
    * ab/i18n-test-fix:
      t/t7508-status.sh: use test_i18ncmp
      t/t6030-bisect-porcelain.sh: use test_i18ngrep
  2. Merge branch 'sn/http-auth-with-netrc-fix'

    gitster committed Nov 7, 2011
    * sn/http-auth-with-netrc-fix:
      http: don't always prompt for password
  3. Merge branch 'pw/p4-appledouble-fix'

    gitster committed Nov 7, 2011
    * pw/p4-appledouble-fix:
      git-p4: ignore apple filetype
  4. remote: fix remote set-url usage

    felipec committed with gitster Nov 7, 2011
    Bad copy-paste.
    
    Otherwise the help text for "git remote set-url --help" would show help
    for "git remote update" subcommand.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. remote: fix set-branches usage

    gitster committed Nov 7, 2011
    Bad copy-paste.
    
    Otherwise "git remote set-branches" without necessary argument
    will result in an error message and help for set-url subcommand.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 6, 2011
  1. git-p4: ignore apple filetype

    Pete Wyckoff committed with gitster Nov 5, 2011
    Revert 97a21ca (git-p4: stop ignoring apple filetype, 2011-10-16)
    and add a test case.
    
    Reported-by: Michael Wookey <michaelwookey@gmail.com>
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. t/t7508-status.sh: use test_i18ncmp

    avar committed with gitster Nov 5, 2011
    Change a i18n-specific comparison in t/t7508-status.sh to use
    test_i18ncmp instead. This was introduced in v1.7.6.3~11^2 and has
    been broken under GETTEXT_POISON=YesPlease since.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. t/t6030-bisect-porcelain.sh: use test_i18ngrep

    avar committed with gitster Nov 5, 2011
    Change a i18n-specific grep in t/t6030-bisect-porcelain.sh to use
    test_i18ngrep instead. This was introduced in v1.7.7.2~5^2~11 and has
    been broken under GETTEXT_POISON=YesPlease since.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 4, 2011
  1. http: don't always prompt for password

    snaewe committed with gitster Nov 4, 2011
    When a username is already specified at the beginning of any HTTP
    transaction (e.g. "git push https://user@hosting.example.com/project.git"
    or "git ls-remote https://user@hosting.example.com/project.git"), the code
    interactively asks for a password before calling into the libcurl library.
    It is very likely that the reason why user included the username in the
    URL is because the user knows that it would require authentication to
    access the resource. Asking for the password upfront would save one
    roundtrip to get a 401 response, getting the password and then retrying
    the request. This is a reasonable optimization.
    
    HOWEVER.
    
    This is done even when $HOME/.netrc might have a corresponding entry to
    access the site, or the site does not require authentication to access the
    resource after all. But neither condition can be determined until we call
    into libcurl library (we do not read and parse $HOME/.netrc ourselves). In
    these cases, the user is forced to respond to the password prompt, only to
    give a password that is not used in the HTTP transaction. If the password
    is in $HOME/.netrc, an empty input would later let the libcurl layer to
    pick up the password from there, and if the resource does not require
    authentication, any input would be taken and then discarded without
    getting used. It is wasteful to ask this unused information to the end
    user.
    
    Reduce the confusion by not trying to optimize for this case and always
    incur roundtrip penalty. An alternative might be to document this and keep
    this round-trip optimization as-is.
    
    Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
    Helped-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 3, 2011
  1. receive-pack: do not expect object 0{40} to exist

    gitster committed Nov 3, 2011
    When pushing to delete a ref, it uses 0{40} as an object name to signal
    that the request is a deletion. We shouldn't trigger "deletion of a
    corrupt ref" warning in such a case, which was designed to notice that a
    ref points at an object that is truly missing from the repository.
    
    Reported-by: Stefan Näwe
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 2, 2011
  1. t3200: add test case for 'branch -m'

    snaewe committed with gitster Nov 2, 2011
    Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. branch -m: handle no arg properly

    rctay committed with gitster Nov 2, 2011
    Modify the option parsing heuristic to handle all -m (rename) cases,
    including the no-arg case.
    
    Previously, this "fell through" to the (argc <= 2) case and caused
    segfault.
    
    Reported-by: Stefan Näwe <stefan.naewe@atlas-elektronik.com>
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 1, 2011
  1. Update draft release notes to 1.7.8

    gitster committed Nov 1, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with 1.7.7.2

    gitster committed Nov 1, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Git 1.7.7.2

    gitster committed Nov 1, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>