Skip to content
Commits on Jul 29, 2009
  1. GIT 1.6.3.4

    committed Jul 28, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @bebarino

    config.txt: document add.ignore-errors

    bebarino committed with May 30, 2009
    Use the description of "--ignore-errors" from git-add.txt as
    inspiration.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. request-pull: allow ls-remote to notice remote.$nickname.uploadpack

    Tom Grennan committed with Jul 28, 2009
    The location to pull from should be converted from the configured nickname
    to URL in the message, but ls-remote should be fed the nickname so that
    the command uses remote.$nickname.* variables, most notably "uploadpack".
    
    Signed-off-by: Tom Grennan <tgrennan@redback.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 25, 2009
  1. t8005: Nobody writes Russian in shift_jis

    committed Jun 18, 2009
    The second and third tests of this script expected that Russian strings
    are converted between ISO-8859-5 and Shift_JIS in the "blame --porcelain"
    format output correctly.
    
    Sure, many platforms may convert between such a combination, but that is
    only because one of the base character set of Shift_JIS, JIS X 0208,
    defines codepoints for Russian characters (among others); I do not think
    anybody uses Shift_JIS when seriously writing Russian, and it is perfectly
    understandable if iconv() libraries on some platforms fail converting
    between this combination, as it does not matter in reality.
    
    This patch changes the test to verify Japanese strings are converted
    correctly between EUC-JP and Shift_JIS in the same procedure.  The point
    of the test is not about verifying the platform's iconv() library, but to
    see if "git blame" makes correct iconv() library calls when it should.
    
    We could instead use ISO-8859-5 and KOI8-R as the combination, because
    they are both meant to represent Russian, in order to make this test
    meaningful on more platforms, but we already use Shift_JIS vs EUC-JP
    combinations to test other programs in our test suite, so this combination
    is safer from the point of view of the portability.  Besides, I do not
    read nor write Russian; sorry ;-)
    
    This change allows tests to pass on my (friend's) Solaris 5.11 box.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Fix severe breakage in "git-apply --whitespace=fix"

    committed Jul 25, 2009
    735c674 (Trailing whitespace and no newline fix, 2009-07-22) completely
    broke --whitespace=fix, causing it to lose all the empty lines in a patch.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 24, 2009
  1. SunOS grep does not understand -C<n> nor -e

    committed Jul 23, 2009
    The first "grep -C1" test in t7002 does not pass on my SunOS-5.11-i86pc,
    and that is not because our way to spawn external grep is broken, but
    because the native grep does not understand -C<n>.
    
    It turns out that Peff was also using this option himself because our
    Makefile doesn't do that automatically.  Brandon Casey uses SUNWspro
    compiler without having to set this, and it turns out that the compiler
    does not define preprocessor macro __unix__ which made him always use the
    built-in grep, never an external one.
    
    Let's be more explicit and say that we do not use external grep on Suns.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @mandree

    Fix export_marks() error handling.

    mandree committed with Jul 24, 2009
    - Don't leak one FILE * on error per export_marks() call. Found with
      cppcheck and reported by Martin Ettl.
    
    - Abort the potentially long for(;idnums.size;) loop on write errors.
    
    - Record error if fprintf() fails for reasons not required to set the
      stream error indicator, such as ENOMEM.
    
    - Add a trailing full-stop to error message when fopen() fails.
    
    Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @torvalds

    git branch: clean up detached branch handling

    torvalds committed with Jul 23, 2009
    Make the 'show detached branch info' a routine of its own.  And in the
    process, avoid the object lookup that is unnecessary if the current
    branch isn't detached.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @torvalds

    git branch: avoid unnecessary object lookups

    torvalds committed with Jul 23, 2009
    They can be expensive in the cold-cache case, so don't bother looking up
    the commits for all branches unless we really need them for some reason.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @torvalds

    git branch: fix performance problem

    torvalds committed with Jul 23, 2009
    'git branch' looks at _all_ the refs, and verifies them.  Which means that
    during cold-cache situations with a slow disk (and lots of tags, for
    example) it can take several very annoying seconds (7.5s according to a
    report by Carlos R.  Mafra).
    
    This avoids most of it by simply doing the filtering before looking up
    the commits, by using the "raw" version of for_each_ref.
    
    Reported-by: Carlos R. Mafra <crmafra2@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 23, 2009
  1. do_one_ref(): null_sha1 check is not about broken ref

    committed Jul 22, 2009
    f8948e2 (remote prune: warn dangling symrefs, 2009-02-08) introduced a
    more dangerous variant of for_each_ref() family that skips the check for
    dangling refs, but it also made another unrelated check optional by
    mistake.
    
    The check to see if a ref points at 0{40} is not about brokenness, but is
    about a possible future plan to represent a deleted ref by writing 40 "0"
    in a loose ref when there is a stale version of the same ref already in
    .git/packed-refs, so that we can implement deletion of a ref without
    having to rewrite the packed refs file excluding the ref being deleted.
    
    This check has to live outside of the conditional.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @szeder

    Trailing whitespace and no newline fix

    szeder committed with Jul 22, 2009
    If a patch adds a new line to the end of a file and this line ends with
    one trailing whitespace character and has no newline, then
    '--whitespace=fix' currently does not remove that trailing whitespace.
    
    This patch fixes this by removing the check for trailing whitespace at
    the end of the line at a hardcoded offset which does not take the
    eventual absence of newline into account.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 22, 2009
  1. diff --cc: a lost line at the beginning of the file is shown incorrectly

    committed Jul 22, 2009
    When combine-diff inspected the diff from one parent to the merge result,
    it misinterpreted a header in the form @@ -l,k +0,0 @@.
    
    This hunk header means that K lines were removed from the beginning of the
    file, so the lost lines must be queued to the sline that represents the
    first line of the merge result, but we incremented our pointer incorrectly
    and ended up queuing it to the second line, which in turn made the lossage
    appear _after_ the first line.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. combine-diff.c: fix performance problem when folding common deleted l…

    committed Jul 22, 2009
    …ines
    
    For a deleted line in a patch with the parent we are looking at, the
    append_lost() function finds the same line among a run of lines that were
    deleted from the same location by patches from parents we previously
    checked.  This is so that patches with two parents
    
        @@ -1,4 +1,3 @@    @@ -1,4 +1,3 @@
         one                   one
        -two                  -two
         three                 three
        -quatro               -fyra
        +four                 +four
    
    can be coalesced into this sequence, reusing one line that describes the
    removal of "two" for both parents.
    
       @@@ -1,4 -1,4 +1,3 @@@
         one
       --two
         three
       - quatro
        -frya
       ++four
    
    While reading the second patch (that removes "two" and then "fyra"), after
    finding where removal of the "two" matches, we need to find existing
    removal of "fyra" (if exists) in the removal list, but the match has to
    happen after all the existing matches (in this case "two").  The code used
    a naïve O(n^2) algorithm to compute this by scanning the whole removal
    list over and over again.
    
    This patch remembers where the next scan should be started in the existing
    removal list to avoid this.
    
    Noticed by Linus Torvalds.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 18, 2009
  1. checkout -f: deal with a D/F conflict entry correctly

    committed Jul 18, 2009
    When we switch branches with "checkout -f", unpack_trees() feeds two
    cache_entries to oneway_merge() function in its src[] array argument.  The
    zeroth entry comes from the current index, and the first entry represents
    what the merge result should be, taken from the tree recorded in the
    commit we are switching to.
    
    When we have a blob (either regular file or a symlink) in the index and in
    the work tree at path "foo", and the switched-to tree has "foo/bar",
    i.e. "foo" becomes a directory, src[0] is obviously that blob currently
    registered at "foo".  Even though we do not have anything at "foo" in the
    switched-to tree, src[1] is _not_ NULL in this case.
    
    The unpack_trees() machinery places a special marker df_conflict_entry
    to signal that no blob exists at "foo", but it will become a directory
    that may have somthing underneath it (namely "foo/bar"), so a usual 3-way
    merge can notice the situation.
    
    But oneway_merge() codepath failed to notice this and passed the special
    marker directly to merged_entry().  This happens to remove the "foo" in
    the end because the df_conflict_entry does not have any name (hence the
    "error" message) and its addition in add_index_entry() is rejected, but it
    is wrong.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jul 16, 2009
  1. @drafnel

    sha1_name.c: avoid unnecessary strbuf_release

    drafnel committed with Jul 16, 2009
    When we fall back to a standard for_each_reflog_ent() after failing to find
    the nth branch switch (or if we had a short reflog) with the call to
    for_each_recent_reflog_ent(), we do not need to free the memory allocated
    for our strbuf's since a strbuf_reset() will be performed in
    grab_nth_branch_switch() before assigning to the entry.
    
    Plus, the strbuf_release() negates the non-zero hint we initially gave to
    strbuf_init() just above these lines.
    
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @drafnel

    refs.c: release file descriptor on error return

    drafnel committed with Jul 16, 2009
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 8, 2009
  1. Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint

    committed Jul 8, 2009
    * cb/maint-fetch-refspec-wo-dst:
      fetch: do not create ref from empty name
  2. Merge branch 'cf/maint-remote-uploadpack-useconfig-fix' into maint

    committed Jul 8, 2009
    * cf/maint-remote-uploadpack-useconfig-fix:
      git-remote: fix missing .uploadpack usage for show command
  3. @sitaramc

    Documentation: update description of shell aliases

    sitaramc committed with Jul 1, 2009
    Aliases that invoke shell commands start from the top-level directory,
    but this was not documented.
    
    Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 1, 2009
  1. @michal42

    request-pull: really really disable pager

    michal42 committed with Jul 1, 2009
    Earlier 476cc72 (request-pull: really disable pager, 2009-06-30)
    tried to use the correct environment variable to disable paging
    from multiple calls to "git log" and friends, but there was one
    extra call to "git log" that was not covered by the trick.
    
    Move the setting and exporting of GIT_PAGER much earlier in the
    script to cover everybody.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 30, 2009
  1. attr: plug minor memory leak

    René Scharfe committed with Jul 1, 2009
    Free the memory allocated for struct strbuf pathbuf when we're done.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. request-pull: really disable pager

    committed Jun 30, 2009
    ff06c74 (Improve request-pull to handle non-rebased branches, 2007-05-01)
    attempted to disable pager when running subcommands in this script, but
    with a wrong variable.  If GIT_PAGER is set, it takes precedence over
    PAGER.
    
    Noticed by Michal Marek.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Makes some cleanup/review in gittutorial

    Thadeu Lima de Souza Cascardo committed with Jun 29, 2009
    There are some different but little cleanup changes to fix some missing
    quotes, to fix what seemed to be an unended sentence, to reident a
    little paragraph with too large a sentence and fix a branch name that
    was referred to twice later by another name.
    
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @j6t

    Makefile: git.o depends on library headers

    j6t committed with Jun 29, 2009
    This dependency was not yet specified anywhere else.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. git-submodule documentation: fix foreach example

    Miklos Vajna committed with Jun 28, 2009
    Backtick and apostrophe are asciidoc markup, so they should be escaped
    in order to get the expected result in the rendered manual page.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 27, 2009
  1. @Oblomov

    gitweb/README: fix AliasMatch in example

    Oblomov committed with Jun 27, 2009
    When combining "dumb client" and human-friendly access by using the
    '.git' extension to switch between the two, make sure the AliasMatch
    covers the entire request. Without a full match, a request for
    
    http://git.example.com/project/shortlog/branch..gitsomething
    
    would result in a 404 because the server would try to access the
    the project 'project/shortlog/branch.'
    
    The solution is still not bulletproof, so document the possible failing
    case.
    
    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @trast

    Test grep --and/--or/--not

    trast committed with Jun 27, 2009
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @trast

    Test git archive --remote

    trast committed with Jun 27, 2009
    Add a small test case for git archive --remote (and thus
    git-upload-archive), which so far went untested.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 25, 2009
  1. git-remote: fix missing .uploadpack usage for show command

    Chris Frey committed with Jun 25, 2009
    For users pulling from machines with self compiled git installs,
    in non-PATH locations, they can set the config option
    remote.<name>.uploadpack to set the location of git-upload-pack.
    
    When using 'git remote show <name>', the remote HEAD check
    did not use the uploadpack configuration setting, and would
    not use the configured program.
    
    In builtin-remote.c, the config setting is already loaded
    with the call to remote_get(), so this patch passes that remote
    along to transport_get().
    
    Signed-off-by: Chris Frey <cdfrey@foursquare.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 23, 2009
  1. @RoelKluin

    fread does not return negative on error

    RoelKluin committed with Jun 22, 2009
    size_t res cannot be less than 0. fread returns 0 on error.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 22, 2009
  1. @j6t

    t3700-add: add a POSIXPERM prerequisite to a new test

    j6t committed with Jun 22, 2009
    The new test does a 'chmod 0', which does not have the intended
    effect on Windows.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'sb/maint-1.6.0-add-config-fix' into maint

    committed Jun 22, 2009
    * sb/maint-1.6.0-add-config-fix:
      add: allow configurations to be overriden by command line
  3. GIT 1.6.3.3

    committed Jun 21, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'ak/maint-for-each-ref-no-lookup' into maint

    committed Jun 21, 2009
    * ak/maint-for-each-ref-no-lookup:
      for-each-ref: Do not lookup objects when they will not be used
Something went wrong with that request. Please try again.