Permalink
Commits on Dec 25, 2008
  1. GIT 1.6.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 25, 2008
Commits on Dec 24, 2008
  1. Merge branch 'js/rebase-i-p'

    * js/rebase-i-p:
      rebase -i -p: leave a --cc patch when a merge could not be redone
      rebase -i -p: Fix --continue after a merge could not be redone
      Show a failure of rebase -p if the merge had a conflict
    gitster committed Dec 24, 2008
  2. rebase -i -p: leave a --cc patch when a merge could not be redone

    The result is easier to review this way, and the merge resolution has to be
    done inside the work tree, not by adjusting "the patch" anyway.
    dscho committed with gitster Dec 22, 2008
Commits on Dec 23, 2008
  1. t9129: skip the last three tests if UTF-8 locale is not available

    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Dec 23, 2008
Commits on Dec 22, 2008
  1. GIT 1.6.1-rc4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 22, 2008
  2. Always show which directory is not a git repository

    Unify all
    
      fatal: Not a git repository
    
    error messages so they include path information.
    
    Signed-off-by: Richard Hartmann <richih@net.in.tum.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    RichiH committed with gitster Dec 21, 2008
  3. Make help entries alphabetical

    Signed-off-by: Richard Hartmann <richih@net.in.tum.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    RichiH committed with gitster Dec 21, 2008
  4. Merge branch 'maint'

    * maint:
      doc/git-fsck: change the way for getting heads' SHA1s
    gitster committed Dec 22, 2008
  5. git-revert documentation: refer to new HOWTO on reverting faulty merges

    Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    stephen-smith committed with gitster Dec 22, 2008
  6. git-revert: record the parent against which a revert was made

    As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging
    from a previously reverted a merge of a side branch may need a revert of
    the revert beforehand.  Record against which parent the revert was made in
    the commit, so that later the user can figure out what went on.
    
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Robin Rosenberg committed with gitster Dec 21, 2008
  7. Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Force the focus to the main window on Windows
      gitk: Allow unbalanced quotes/braces in commit headers
      gitk: Update German translation
      gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
      gitk: Ensure that "Reset branch" menu entry is enabled
      gitk: Use check-buttons' -text property instead of separate labels
      gitk: Map / to focus the search box
      gitk: Fix bugs in blaming code
    gitster committed Dec 22, 2008
Commits on Dec 21, 2008
  1. gitk: Force the focus to the main window on Windows

    On msysGit, the focus is first on the (Tk) console.  This console is then
    hidden, but keeps the focus.  Work around that by forcing the focus onto
    the gitk window.
    
    This fixes msysGit issue 14.  Diagnosed and originally fixed by
    Johannes Schindelin.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    j6t committed with paulusmack Dec 18, 2008
  2. gitk: Allow unbalanced quotes/braces in commit headers

    When parsing commits, gitk treats the headers of the commit as tcl
    lists.  This causes errors if the header contains an unbalanced quote
    or open brace.  Splitting the line on spaces allows us to treat it as
    a set of words instead of as a tcl list, which prevents errors.
    
    Signed-off-by: Kevin Ballard <kevin@sb.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    kballard committed with paulusmack Dec 18, 2008
  3. gitk: Update German translation

    Attached to avoid whitespace problems.
    
    Regards,
    
    Christian
    
    From 282060ac531fee722142f9d39c4ff29570723cbb Mon Sep 17 00:00:00 2001
    From: Christian Stimming <stimming@tuhh.de>
    Date: Sat, 6 Dec 2008 20:47:15 +0100
    Subject: [PATCH 2/2] gitk: Update German translation
    
    Merged with most recent "make update-po" result.
    
    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    cstim committed with paulusmack Dec 6, 2008
  4. gitk: Mark forgotten strings (header sentence parts in color chooser)…

    … for translation
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    cstim committed with paulusmack Dec 6, 2008
  5. gitk: Ensure that "Reset branch" menu entry is enabled

    Consider this sequence of events:
    
    1. Detach HEAD and fire up gitk
    2. Call the context menu on some commit. Notice that the last menu entry
       says "Detached HEAD: can't reset" and it is disabled.
    3. Now checkout some regular branch (e.g. 'master') using the context menu.
    4. Call the context menu again on some commit.
    
    Previously, at this point the last menu entry said "Reset master branch
    to here", but it was still disabled. With this fix it is now enabled again.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    j6t committed with paulusmack Dec 3, 2008
  6. gitk: Use check-buttons' -text property instead of separate labels

    Previously the check-buttons' labels in the Preferences were separate
    widgets.  This had the disadvantage that in order to toggle the
    check-button with the mouse the check-box had to be clicked.  With
    this change the check-box can also be toggled by clicking the label.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    j6t committed with paulusmack Dec 2, 2008
  7. gitk: Map / to focus the search box

    The / key is often used to initiate searches (less, vim, some web
    browsers).  This changes the binding for the / (slash) key from 'find
    next' to 'focus the search box' to follow this convention.
    
    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Oblomov committed with paulusmack Dec 2, 2008
  8. doc/git-fsck: change the way for getting heads' SHA1s

    The straightforward way with using 'cat .git/refs/heads/*' doesn't work
    with packed refs as well as branches of the form topic/topic1. So let's
    use git-for-each-ref for getting the heads' SHA1s in this example.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Dec 21, 2008
  9. Documentation/git-show-branch: work around "single quote" typesetting…

    … glitch
    
    The displayed example is typeset with acute accents around the string that
    should be surrounded by a pair of single quotes in manpage.  Replace them
    with double quotes (the semantics of the example does not change).
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Dec 21, 2008
  10. send-email: futureproof split_addrs() sub

    Matt Kraai points out that calling parse_line() assuming that the caller
    ever passes only one argument is a bug waiting to happen, and he is
    right.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 21, 2008
  11. Make sure lockfiles are unlocked when dying on SIGPIPE

    We cleaned up lockfiles upon receiving the usual suspects HUP, TERM, QUIT
    but a wicked user could kill us of asphyxiation by piping our output to a
    pipe that does not read.  Protect ourselves by catching SIGPIPE and clean
    up the lockfiles as well in such a case.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 19, 2008
  12. fast-import.c: stricter strtoul check, silence compiler warning

    Store the return value of strtoul() in order to avoid compiler
    warnings on Ubuntu 8.10.
    
    Also check errno after each call, which is the only way to notice
    an overflow without making ULONG_MAX an illegal date.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Dec 21, 2008
  13. connect.c: stricter port validation, silence compiler warning

    In addition to checking if the provided port is numeric, also check
    that the string isn't empty and that the port number is within the
    valid range.  Incidentally, this silences a compiler warning about
    ignoring strtol's return value.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Dec 21, 2008
  14. Add a documentat on how to revert a faulty merge

    Linus and Junio explained issues that are involved in reverting a merge
    and how to continue working with a branch that was updated since such a
    revert on the mailing list.  This is to help new people who did not see
    these messages.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nanako Shiraishi committed with gitster Dec 20, 2008
  15. Remove the requirement opaquelocktoken uri scheme

    The program flow of pushing over http is:
    
     - call lock_remote() to issue a DAV_LOCK request to the server to lock
       info/refs and branch refs being pushed into; handle_new_lock_ctx() is
       used to parse its response to populate "struct remote_lock" that is
       returned from lock_remote();
    
     - send objects;
    
     - call unlock_remote() to drop the lock.
    
    The handle_new_lock_ctx() function assumed that the server will use a
    lock token in opaquelocktoken URI scheme, which may have been an Ok
    assumption under RFC 2518, but under RFC 4918 which obsoletes the older
    standard it is not necessarily true.
    
    This resulted in push failure (often resulted in "cannot lock existing
    info/refs" error message) when talking to a server that does not use
    opaquelocktoken URI scheme.
    
    Signed-off-by: Kirill A. Korinskiy <catap@catap.ru>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    catap committed with gitster Dec 20, 2008
  16. git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir

    I want directories of my working tree to be linked to from various
    paths on my filesystem where third-party components expect them, both
    in development and production environments.  A build system's install
    step could solve this, but I develop scripts and web pages that don't
    need to be built.  Git's submodule system could solve this, but we
    tend to develop, branch, and test those directories all in unison, so
    one big repository feels more natural.  We prefer to edit and commit
    on the symlinked paths, not the canonical ones, and in that setting,
    "git pull" fails to find the top-level directory of the repository
    while other commands work fine.
    
    "git pull" fails because POSIX shells have a notion of current working
    directory that is different from getcwd().  The shell stores this path
    in PWD.  As a result, "cd ../" can be interpreted differently in a
    shell script than chdir("../") in a C program.  The shell interprets
    "../" by essentially stripping the last textual path component from
    PWD, whereas C chdir() follows the ".." link in the current directory
    on the filesystem.  When PWD is a symlink, these are different
    destinations.  As a result, Git's C commands find the correct
    top-level working tree, and shell scripts do not.
    
    Changes:
    
    * When interpreting a relative upward (../) path in cd_to_toplevel,
      prepend the cwd without symlinks, given by /bin/pwd
    * Add tests for cd_to_toplevel and "git pull" in a symlinked
      directory that failed before this fix, plus contrasting scenarios
      that already worked
    
    Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Marcel M. Cary committed with gitster Dec 15, 2008
  17. rebase -i -p: Fix --continue after a merge could not be redone

    When a merge that has a conflict was rebased, then rebase stopped to let
    the user resolve the conflicts. However, thereafter --continue failed
    because the author-script was not saved. (This is rebase -i's way to
    preserve a commit's authorship.) This fixes it by doing taking the same
    failure route after a merge that is also taken after a normal cherry-pick.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Dec 15, 2008
  18. Show a failure of rebase -p if the merge had a conflict

    This extends t3409-rebase-preserve-merges by a case where the merge that
    is rebased has a conflict. Therefore, the rebase stops and expects that
    the user resolves the conflict. However, currently rebase --continue
    fails because .git/rebase-merge/author-script is missing.
    
    The test script had allocated two identical clones, but only one of them
    (clone2) was used. Now we use both as indicated in the comment. Also,
    two instances of && was missing in the setup part.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Dec 15, 2008
Commits on Dec 20, 2008
  1. Documentation: fix typos, grammar, asciidoc syntax

    [jc: the original patch was against master but 99% of it
     applied to maint; this commit splits out the part that
     applies only to master.]
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Dec 19, 2008
  2. Merge branch 'maint' to sync with GIT 1.6.0.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 20, 2008
  3. GIT 1.6.0.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 20, 2008
  4. fast-import: make tagger information optional

    Even though newer Porcelain tools always record the tagger information
    when creating new tags, export/import pair should be able to faithfully
    reproduce ancient tag objects that lack tagger information.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    gitster committed Dec 19, 2008
  5. fast-export: deal with tag objects that do not have a tagger

    When no tagger was found (old Git produced tags like this),
    no "tagger" line is printed (but this is incompatible with the current
    git fast-import).
    
    Alternatively, you can pass the option --fake-missing-tagger, forcing
    fast-export to fake a tagger
    
    	Unspecified Tagger <no-tagger>
    
    with a tag date of the beginning of (Unix) time in the case of a missing
    tagger, so that fast-import is still able to import the result.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Dec 20, 2008
  6. SubmittingPatches: mention the usage of real name in Signed-off-by: l…

    …ines
    
    Especially with something that is supposed to hopefully have some legal
    value down the line if somebody starts making noises, it really would be
    nice to have a real person to associate things with. Suggest this in the
    SubmittingPatches document.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Dec 20, 2008