From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Nov 2014 18:52:31 +0000 (-0800)
Subject: Merge branch 'jk/fetch-reflog-df-conflict'
X-Git-Tag: v2.2.0-rc1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1671dd82b5e1c6e837a3f47509a3a33189b0884;p=thirdparty%2Fgit.git

Merge branch 'jk/fetch-reflog-df-conflict'

Corner-case bugfixes for "git fetch" around reflog handling.

* jk/fetch-reflog-df-conflict:
  ignore stale directories when checking reflog existence
  fetch: load all default config at startup
---

a1671dd82b5e1c6e837a3f47509a3a33189b0884
diff --cc builtin/fetch.c
index 6ffd02388b,36f386dbb3..7b84d35d83
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -68,22 -66,9 +68,22 @@@ static int git_fetch_config(const char 
  		fetch_prune_config = git_config_bool(k, v);
  		return 0;
  	}
- 	return 0;
+ 	return git_default_config(k, v, cb);
  }
  
 +static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
 +{
 +	ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc);
 +
 +	/*
 +	 * "git fetch --refmap='' origin foo"
 +	 * can be used to tell the command not to store anywhere
 +	 */
 +	if (*arg)
 +		refmap_array[refmap_nr++] = arg;
 +	return 0;
 +}
 +
  static struct option builtin_fetch_options[] = {
  	OPT__VERBOSITY(&verbosity),
  	OPT_BOOL(0, "all", &all,
diff --cc refs.c
index 0368ed461f,e9eda881d0..5ff457ebfc
--- a/refs.c
+++ b/refs.c
@@@ -2962,16 -2751,13 +2962,16 @@@ int log_ref_setup(const char *refname, 
  
  	logfd = open(logfile, oflags, 0666);
  	if (logfd < 0) {
- 		if (!(oflags & O_CREAT) && errno == ENOENT)
+ 		if (!(oflags & O_CREAT) && (errno == ENOENT || errno == EISDIR))
  			return 0;
  
- 		if ((oflags & O_CREAT) && errno == EISDIR) {
+ 		if (errno == EISDIR) {
  			if (remove_empty_directories(logfile)) {
 -				return error("There are still logs under '%s'",
 -					     logfile);
 +				int save_errno = errno;
 +				error("There are still logs under '%s'",
 +				      logfile);
 +				errno = save_errno;
 +				return -1;
  			}
  			logfd = open(logfile, oflags, 0666);
  		}
diff --cc t/t1410-reflog.sh
index 8cab06f90a,e4409e38df..976c1d4277
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@@ -245,12 -245,38 +245,46 @@@ test_expect_success 'gc.reflogexpire=fa
  
  '
  
 +test_expect_success 'checkout should not delete log for packed ref' '
 +	test $(git reflog master | wc -l) = 4 &&
 +	git branch foo &&
 +	git pack-refs --all &&
 +	git checkout foo &&
 +	test $(git reflog master | wc -l) = 4
 +'
 +
+ test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' '
+ 	test_when_finished "git branch -d a || git branch -d a/b" &&
+ 
+ 	git branch a/b master &&
+ 	echo "a/b@{0} branch: Created from master" >expect &&
+ 	git log -g --format="%gd %gs" a/b >actual &&
+ 	test_cmp expect actual &&
+ 	git branch -d a/b &&
+ 
+ 	# now logs/refs/heads/a is a stale directory, but
+ 	# we should move it out of the way to create "a" reflog
+ 	git branch a master &&
+ 	echo "a@{0} branch: Created from master" >expect &&
+ 	git log -g --format="%gd %gs" a >actual &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
+ 	test_when_finished "git branch -d a || git branch -d a/b" &&
+ 
+ 	git branch a/b master &&
+ 	echo "a/b@{0} branch: Created from master" >expect &&
+ 	git log -g --format="%gd %gs" a/b >actual &&
+ 	test_cmp expect actual &&
+ 	git branch -d a/b &&
+ 
+ 	# same as before, but we only create a reflog for "a" if
+ 	# it already exists, which it does not
+ 	git -c core.logallrefupdates=false branch a master &&
+ 	: >expect &&
+ 	git log -g --format="%gd %gs" a >actual &&
+ 	test_cmp expect actual
+ '
+ 
  test_done
diff --cc t/t5516-fetch-push.sh
index 7c8a769a90,2b69afaf37..f4da20aa9b
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@@ -1277,17 -1278,43 +1278,56 @@@ EO
  	git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo
  '
  
 +test_expect_success 'pushing a tag pushes the tagged object' '
 +	rm -rf dst.git &&
 +	blob=$(echo unreferenced | git hash-object -w --stdin) &&
 +	git tag -m foo tag-of-blob $blob &&
 +	git init --bare dst.git &&
 +	git push dst.git tag-of-blob &&
 +	# the receiving index-pack should have noticed
 +	# any problems, but we double check
 +	echo unreferenced >expect &&
 +	git --git-dir=dst.git cat-file blob tag-of-blob >actual &&
 +	test_cmp expect actual
 +'
 +
+ test_expect_success 'push into bare respects core.logallrefupdates' '
+ 	rm -rf dst.git &&
+ 	git init --bare dst.git &&
+ 	git -C dst.git config core.logallrefupdates true &&
+ 
+ 	# double push to test both with and without
+ 	# the actual pack transfer
+ 	git push dst.git master:one &&
+ 	echo "one@{0} push" >expect &&
+ 	git -C dst.git log -g --format="%gd %gs" one >actual &&
+ 	test_cmp expect actual &&
+ 
+ 	git push dst.git master:two &&
+ 	echo "two@{0} push" >expect &&
+ 	git -C dst.git log -g --format="%gd %gs" two >actual &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'fetch into bare respects core.logallrefupdates' '
+ 	rm -rf dst.git &&
+ 	git init --bare dst.git &&
+ 	(
+ 		cd dst.git &&
+ 		git config core.logallrefupdates true &&
+ 
+ 		# as above, we double-fetch to test both
+ 		# with and without pack transfer
+ 		git fetch .. master:one &&
+ 		echo "one@{0} fetch .. master:one: storing head" >expect &&
+ 		git log -g --format="%gd %gs" one >actual &&
+ 		test_cmp expect actual &&
+ 
+ 		git fetch .. master:two &&
+ 		echo "two@{0} fetch .. master:two: storing head" >expect &&
+ 		git log -g --format="%gd %gs" two >actual &&
+ 		test_cmp expect actual
+ 	)
+ '
+ 
  test_done