• S
    git-gui: Correct 'git gui blame' in a subdirectory · c80d25db
    Shawn O. Pearce 提交于
    David Kastrup pointed out that the following sequence was not
    working as we had intended:
    
      $ cd lib
      $ git gui blame console.tcl
      fatal: cannot stat path lib/console.tcl: No such file or directory
    
    The problem here was we disabled the chdir to the root of the
    working tree when we are running with a "bare allowed" feature
    such as blame or browser, but we still kept the prefix we found via
    `git rev-parse --show-prefix`.  This caused us to try and look for
    the file "console.tcl" within the subdirectory but also include
    the subdirectory's own path from the root of the working tree.
    This is unlikely to succeed, unless the user just happened to have
    a "lib/lib/console.tcl" file in the repository, in which case we
    would produce the wrong result.
    
    In the case of a bare repository we shouldn't get back a value from
    `rev-parse --show-prefix`, so really $_prefix should only be set
    to the non-empty string if we are in a working tree and we are in a
    subdirectory of that working tree.  If this is true we really want
    to always be at the top level of the working tree, as all paths are
    accessed as though they were relative to the top of the working tree.
    Converting $_prefix to a ../ sequence is a fairly simple approach
    to moving up the requisite levels.
    Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
    c80d25db
git-gui.sh 64.0 KB