git/refs.c, branch v1.6.4

Merge branch 'maint'

2009-07-24T16:27:09Z

* maint: SunOS grep does not understand -C nor -e Fix export_marks() error handling. git branch: clean up detached branch handling git branch: avoid unnecessary object lookups git branch: fix performance problem do_one_ref(): null_sha1 check is not about broken ref Conflicts: Makefile

do_one_ref(): null_sha1 check is not about broken ref

2009-07-23T06:07:05Z

f8948e2 (remote prune: warn dangling symrefs, 2009-02-08) introduced a more dangerous variant of for_each_ref() family that skips the check for dangling refs, but it also made another unrelated check optional by mistake. The check to see if a ref points at 0{40} is not about brokenness, but is about a possible future plan to represent a deleted ref by writing 40 "0" in a loose ref when there is a stale version of the same ref already in .git/packed-refs, so that we can implement deletion of a ref without having to rewrite the packed refs file excluding the ref being deleted. This check has to live outside of the conditional. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-07-18T23:57:47Z

* maint: checkout -f: deal with a D/F conflict entry correctly sha1_name.c: avoid unnecessary strbuf_release refs.c: release file descriptor on error return

refs.c: release file descriptor on error return

2009-07-16T22:07:24Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Convert existing die(..., strerror(errno)) to die_errno()

2009-06-27T18:14:53Z

Change calls to die(..., strerror(errno)) to use the new die_errno(). In the process, also make slight style adjustments: at least state _something_ about the function that failed (instead of just printing the pathname), and put paths in single quotes. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-05-26T02:44:52Z

* maint: Prepare for 1.6.3.2 fix cat-file usage message and documentation fetch: report ref storage DF errors more accurately lock_ref: inform callers of unavailable ref merge-options.txt: Clarify merge --squash Conflicts: RelNotes

Merge branch 'ar/unlink-err' into maint

2009-05-26T02:01:50Z

* ar/unlink-err: print unlink(2) errno in copy_or_link_directory replace direct calls to unlink(2) with unlink_or_warn Introduce an unlink(2) wrapper which gives warning if unlink failed

lock_ref: inform callers of unavailable ref

2009-05-25T19:06:54Z

One of the ways that locking might fail is that there is a DF conflict between two refs (e.g., you want to lock "foo/bar" but "foo" already exists). In this case, we return an error, but there is no way for the caller to know the specific problem. This patch sets errno to ENOTDIR, which is the most sensible code. It's what we would see if the refs were stored purely in the filesystem (but these days we must check the namespace manually due to packed refs). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'fc/decorate-tag'

2009-05-23T08:43:50Z

* fc/decorate-tag: Prettify log decorations even more Change prettify_ref to prettify_refname

Merge branch 'rr/forbid-bs-in-ref'

2009-05-23T08:39:45Z

* rr/forbid-bs-in-ref: Disallow '\' in ref names