Sync with 1.8.1 maintenance track
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:18:01 +0000 (09:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:18:01 +0000 (09:18 -0700)
* maint-1.8.1:
  Start preparing for 1.8.1.6
  git-tag(1): we tag HEAD by default
  Fix revision walk for commits with the same dates
  t2003: work around path mangling issue on Windows
  pack-refs: add fully-peeled trait
  pack-refs: write peeled entry for non-tags
  use parse_object_or_die instead of die("bad object")
  avoid segfaults on parse_object failure
  entry: fix filter lookup
  t2003: modernize style
  name-hash.c: fix endless loop with core.ignorecase=true

1  2 
Documentation/git-tag.txt
builtin/grep.c
cache.h
name-hash.c
read-cache.c
refs.c
revision.c

Simple merge
diff --cc builtin/grep.c
@@@ -820,11 -820,7 +820,9 @@@ int cmd_grep(int argc, const char **arg
                unsigned char sha1[20];
                /* Is it a rev? */
                if (!get_sha1(arg, sha1)) {
-                       struct object *object = parse_object(sha1);
-                       if (!object)
-                               die(_("bad object %s"), arg);
+                       struct object *object = parse_object_or_die(sha1, arg);
 +                      if (!seen_dashdash)
 +                              verify_non_filename(prefix, arg);
                        add_object_array(object, arg, &list);
                        continue;
                }
diff --cc cache.h
Simple merge
diff --cc name-hash.c
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc revision.c
Simple merge