1. 18 Feb, 2008 8 commits
  2. 17 Feb, 2008 15 commits
    • Junio C Hamano's avatar
      sending errors to stdout under $PAGER · 61b80509
      Junio C Hamano authored
      If you do this (and you are not an Emacs user who uses PAGER=cat
      in your *shell* buffer):
      
              $ git init
              Initialized empty Git repository in .git/
              $ echo hello world >foo
              $ H=$(git hash-object -w foo)
              $ git tag -a foo-tag -m "Tags $H" $H
              $ echo $H
              3b18e512dba79e4c8300dd08aeb37f8e728b8dad
              $ rm -f .git/objects/3b/18e5*
              $ git show foo-tag
              tag foo-tag
              Tagger: Junio C Hamano <[email protected]>
              Date:   Sat Feb 16 10:43:23 2008 -0800
      
              Tags 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
      
      you do not get any indication of error.  If you are careful, you
      would notice that no contents from the tagged object is
      displayed, but that is about it.  If you run the "show" command
      without pager, however, you will see the error:
      
              $ git --no-pager show foo-tag
              tag foo-tag
              Tagger: Junio C Hamano <[email protected]>
              Date:   Sat Feb 16 10:43:23 2008 -0800
      
              Tags 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
              error: Could not read object 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
      
      Because we spawn the pager as the foreground process and feed
      its input via pipe from the real command, we cannot affect the
      exit status the shell sees from git command when the pager is in
      use (I think there is not much gain we can have by working it
      around, though).  But at least it may make sense to show the
      error message to the user sitting in front of the pager.
      
      [jc: Edgar Toernig suggested a much nicer implementation than
      what I originally posted, which I took.]
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      61b80509
    • Junio C Hamano's avatar
      cf5c51ef
    • Junio C Hamano's avatar
      Merge branch 'maint' · 7cb97da1
      Junio C Hamano authored
      * maint:
        GIT 1.5.4.2
      7cb97da1
    • Junio C Hamano's avatar
      GIT 1.5.4.2 · e5fc9a0a
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      e5fc9a0a
    • Junio C Hamano's avatar
      Merge branch 'bd/qsort' · f8732c55
      Junio C Hamano authored
      * bd/qsort:
        compat: Add simplified merge sort implementation from glibc
      f8732c55
    • Junio C Hamano's avatar
      Merge branch 'sp/safecrlf' · 2ac4b4b2
      Junio C Hamano authored
      * sp/safecrlf:
        safecrlf: Add mechanism to warn about irreversible crlf conversions
      2ac4b4b2
    • Junio C Hamano's avatar
      Merge branch 'cc/browser' · 99073260
      Junio C Hamano authored
      * cc/browser:
        Documentation: add 'git-web--browse.txt' and simplify other docs.
        git-web--browse: fix misplaced quote in init_browser_path()
        web--browse: Add a few quotes in 'init_browser_path'.
        Documentation: instaweb: add 'git-web--browse' information.
        Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
        git-web--browse: do not start the browser with nohup
        instaweb: use 'git-web--browse' to launch browser.
        Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
        help--browse: add '--config' option to check a config option for a browser.
        help: make 'git-help--browse' usable outside 'git-help'.
      
      Conflicts:
      
      	git-web--browse.sh
      99073260
    • Junio C Hamano's avatar
      Merge branch 'jc/gitignore-ends-with-slash' · 987e315a
      Junio C Hamano authored
      * jc/gitignore-ends-with-slash:
        gitignore: lazily find dtype
        gitignore(5): Allow "foo/" in ignore list to match directory "foo"
      987e315a
    • Junio C Hamano's avatar
      Merge branch 'pb/prepare-commit-msg' · 1ae419cb
      Junio C Hamano authored
      * pb/prepare-commit-msg:
        git-commit: add a prepare-commit-msg hook
        git-commit: Refactor creation of log message.
        git-commit: set GIT_EDITOR=: if editor will not be launched
        git-commit: support variable number of hook arguments
      1ae419cb
    • Junio C Hamano's avatar
      Merge branch 'jk/noetcconfig' · fef1c4c0
      Junio C Hamano authored
      * jk/noetcconfig:
        fix config reading in tests
        allow suppressing of global and system config
      
      Conflicts:
      
      	cache.h
      fef1c4c0
    • Junio C Hamano's avatar
      Merge branch 'jc/submittingpatches' · 093d50e0
      Junio C Hamano authored
      * jc/submittingpatches:
        Documentation/SubmittingPatches - a suggested patch flow
        Documentation/SubmittingPatches: What's Acked-by and Tested-by?
        Documentation/SubmittingPatches: discuss first then submit
        Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject header
      093d50e0
    • Junio C Hamano's avatar
      Merge git://repo.or.cz/git-gui · 67cdec1e
      Junio C Hamano authored
      * git://repo.or.cz/git-gui:
        git-gui: Correct size of dictionary name widget in options dialog
        git-gui: Paper bag fix bad string length call in spellchecker
      67cdec1e
    • Junio C Hamano's avatar
      Merge git://git.kernel.org/pub/scm/gitk/gitk · f124e986
      Junio C Hamano authored
      * git://git.kernel.org/pub/scm/gitk/gitk:
        [PATCH] gitk: Heed the lines of context in merge commits
      f124e986
    • Junio C Hamano's avatar
      Merge branch 'maint' · 413b90f0
      Junio C Hamano authored
      * maint:
        Documentation/git-reset: Add an example of resetting selected paths
        Documentation/git-reset: don't mention --mixed for selected-paths reset
        Documentation/git-reset:
      413b90f0
    • Junio C Hamano's avatar
  3. 16 Feb, 2008 17 commits