1. 18 Nov, 2006 4 commits
  2. 17 Nov, 2006 2 commits
    • Linus Torvalds's avatar
      "git fmt-merge-msg" SIGSEGV · 6b1f8c32
      Linus Torvalds authored
      Ok, this is a _really_ stupid case, and I don't think it matters, but hey,
      we should never SIGSEGV.
      
      Steps to reproduce:
      
      	mkdir duh
      	cd duh
      	git init-db
      	git-fmt-merge-msg < /dev/null
      
      will cause a SIGSEGV in cmd_fmt_merge_msg(), because we're doing a
      strncmp() with a NULL current_branch.
      
      And yeah, it's an insane schenario, and no, it doesn't really matter. The
      only reason I noticed was that a broken version of my "git pull" into an
      empty directory would cause this.
      
      This silly patch just replaces the SIGSEGV with a controlled exit with an
      error message.
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      6b1f8c32
    • Linus Torvalds's avatar
      git-pull: allow pulling into an empty repository · d09e79cb
      Linus Torvalds authored
      We used to complain that we cannot merge anything we fetched
      with a local branch that does not exist yet.  Just treat the
      case as a natural extension of fast forwarding and make the
      local branch'es tip point at the same commit we just fetched.
      After all an empty repository without an initial commit is an
      ancestor of any commit.
      
      [jc: I added a trivial test.  We've become sloppy but we should
       stick to the discipline of covering new behaviour with new
       tests. ]
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      d09e79cb
  3. 15 Nov, 2006 7 commits
  4. 13 Nov, 2006 5 commits
  5. 12 Nov, 2006 3 commits
  6. 11 Nov, 2006 2 commits
  7. 10 Nov, 2006 2 commits
  8. 09 Nov, 2006 12 commits
  9. 08 Nov, 2006 3 commits