]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'ar/unlink-err' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:01:50 +0000 (19:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:01:50 +0000 (19:01 -0700)
* 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

1  2 
builtin-fetch-pack.c
diff.c
fast-import.c
http-push.c
lockfile.c
refs.c
server-info.c
sha1_file.c

Simple merge
diff --cc diff.c
Simple merge
diff --cc fast-import.c
Simple merge
diff --cc http-push.c
Simple merge
diff --cc lockfile.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc server-info.c
Simple merge
diff --cc sha1_file.c
Simple merge