From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Jun 2013 23:02:18 +0000 (-0700)
Subject: Merge branch 'js/test-ln-s-add'
X-Git-Tag: v1.8.4-rc0~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0266ed2759fa1838384c37faa6d7264edaaf04b;p=thirdparty%2Fgit.git

Merge branch 'js/test-ln-s-add'

Many tests that check the behaviour of symbolic links stored in the
index or the tree objects do not have to be skipped on a filesystem
that lack symbolic link support.

* js/test-ln-s-add:
  t4011: remove SYMLINKS prerequisite
  t6035: use test_ln_s_add to remove SYMLINKS prerequisite
  t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
  t3100: use test_ln_s_add to remove SYMLINKS prerequisite
  t3030: use test_ln_s_add to remove SYMLINKS prerequisite
  t0000: use test_ln_s_add to remove SYMLINKS prerequisite
  tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
  tests: introduce test_ln_s_add
  t3010: modernize style
  test-chmtime: Fix exit code on Windows
---

c0266ed2759fa1838384c37faa6d7264edaaf04b
diff --cc test-chmtime.c
index 923bf327f8,2e601a8038..0df748784b
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@@ -84,10 -84,10 +84,10 @@@ int main(int argc, char *argv[]
  		if (stat(argv[i], &sb) < 0) {
  			fprintf(stderr, "Failed to stat %s: %s\n",
  			        argv[i], strerror(errno));
- 			return -1;
+ 			return 1;
  		}
  
 -#ifdef WIN32
 +#ifdef GIT_WINDOWS_NATIVE
  		if (!(sb.st_mode & S_IWUSR) &&
  				chmod(argv[i], sb.st_mode | S_IWUSR)) {
  			fprintf(stderr, "Could not make user-writable %s: %s",