WIP: debugging issue with renaming/deleting config keys

vermiculus · vermiculus · commit a5a6eeef86c4 · 2022-04-09T05:59:38.000-05:00
M-x compile := cd ~/git/libgit2/build &amp;&amp; cmake --build . &amp;&amp; ./libgit2_tests -sconfig::rename::can_rename

log: new call to git_config_entries_get_unique
log: needle: core.filemode
log: haystack:
log:   remote.test_with_pushurl.url =&gt; git://github.com/libgit2/fetchlibgit2
log:   remote.test.fetch =&gt; +refs/heads/*:refs/remotes/test/*
log:   branch.master.remote =&gt; test
log:   branch.cannot-fetch.merge =&gt; refs/heads/cannot-fetch
log:   remote.test_with_pushurl.fetch =&gt; +refs/heads/*:refs/remotes/test_with_pushurl/*
log:   core.filemode =&gt; true
log:   branch.mergeless.merge =&gt;
log:   branch.mergeless.remote =&gt; test
log:   remote.joshaber.url =&gt; git://github.com/libgit2/libgit2
log:   remote.empty-remote-url.url =&gt;
log:   branch.mergeandremoteless.merge =&gt;
log:   remote.no-remote-url.fetch =&gt;
log:   remote.empty-remote-pushurl.pushurl =&gt;
log:   core.bare =&gt; true
log:   core.logallrefupdates =&gt; true
log:   branch.track-local.merge =&gt; refs/heads/master
log:   core.repositoryformatversion =&gt; 0
log:   branch.remoteless.remote =&gt;
log:   branch.mergeandremoteless.remote =&gt;
log:   remote.test_with_pushurl.pushurl =&gt; git://github.com/libgit2/pushlibgit2
log:   branch.remoteless.merge =&gt; refs/heads/master
log:   remote.empty-remote-url.pushurl =&gt;
log:   branch.master.merge =&gt; refs/heads/master
log:   branch.cannot-fetch.remote =&gt; joshaber
log:   branch.track-local.remote =&gt; .
log:   remote.test.url =&gt; git://github.com/libgit2/libgit2
log: end
log: found core.filemode=true

log: new call to git_config_entries_get_unique
log: needle: core.symlinks
log: haystack:
log:   remote.test_with_pushurl.url =&gt; git://github.com/libgit2/fetchlibgit2
log:   remote.test.fetch =&gt; +refs/heads/*:refs/remotes/test/*
log:   branch.master.remote =&gt; test
log:   branch.cannot-fetch.merge =&gt; refs/heads/cannot-fetch
log:   remote.test_with_pushurl.fetch =&gt; +refs/heads/*:refs/remotes/test_with_pushurl/*
log:   core.filemode =&gt; true
log:   branch.mergeless.merge =&gt;
log:   branch.mergeless.remote =&gt; test
log:   remote.joshaber.url =&gt; git://github.com/libgit2/libgit2
log:   remote.empty-remote-url.url =&gt;
log:   branch.mergeandremoteless.merge =&gt;
log:   remote.no-remote-url.fetch =&gt;
log:   remote.empty-remote-pushurl.pushurl =&gt;
log:   core.bare =&gt; true
log:   core.logallrefupdates =&gt; true
log:   branch.track-local.merge =&gt; refs/heads/master
log:   core.repositoryformatversion =&gt; 0
log:   branch.remoteless.remote =&gt;
log:   branch.mergeandremoteless.remote =&gt;
log:   remote.test_with_pushurl.pushurl =&gt; git://github.com/libgit2/pushlibgit2
log:   branch.remoteless.merge =&gt; refs/heads/master
log:   remote.empty-remote-url.pushurl =&gt;
log:   branch.master.merge =&gt; refs/heads/master
log:   branch.cannot-fetch.remote =&gt; joshaber
log:   branch.track-local.remote =&gt; .
log:   remote.test.url =&gt; git://github.com/libgit2/libgit2
log: end
log: 'core.symlinks' NOT FOUND

log: new call to git_config_entries_get_unique
log: needle: core.ignorecase
log: haystack:
log:   remote.test_with_pushurl.url =&gt; git://github.com/libgit2/fetchlibgit2
log:   remote.test.fetch =&gt; +refs/heads/*:refs/remotes/test/*
log:   branch.master.remote =&gt; test
log:   branch.cannot-fetch.merge =&gt; refs/heads/cannot-fetch
log:   remote.test_with_pushurl.fetch =&gt; +refs/heads/*:refs/remotes/test_with_pushurl/*
log:   core.filemode =&gt; true
log:   branch.mergeless.merge =&gt;
log:   branch.mergeless.remote =&gt; test
log:   remote.joshaber.url =&gt; git://github.com/libgit2/libgit2
log:   remote.empty-remote-url.url =&gt;
log:   branch.mergeandremoteless.merge =&gt;
log:   remote.no-remote-url.fetch =&gt;
log:   remote.empty-remote-pushurl.pushurl =&gt;
log:   core.bare =&gt; true
log:   core.logallrefupdates =&gt; true
log:   branch.track-local.merge =&gt; refs/heads/master
log:   core.repositoryformatversion =&gt; 0
log:   branch.remoteless.remote =&gt;
log:   branch.mergeandremoteless.remote =&gt;
log:   remote.test_with_pushurl.pushurl =&gt; git://github.com/libgit2/pushlibgit2
log:   branch.remoteless.merge =&gt; refs/heads/master
log:   remote.empty-remote-url.pushurl =&gt;
log:   branch.master.merge =&gt; refs/heads/master
log:   branch.cannot-fetch.remote =&gt; joshaber
log:   branch.track-local.remote =&gt; .
log:   remote.test.url =&gt; git://github.com/libgit2/libgit2
log: end
log: 'core.ignorecase' NOT FOUND

log: new call to git_config_entries_get_unique
log: needle: branch.local-track.remote
log: haystack:
log: end
log: 'branch.local-track.remote' NOT FOUND

log: new call to git_config_entries_get_unique
log: needle: branch.track-local.remote
log: haystack:
log:   branch.local-track.remote =&gt; .
log: end
log: 'branch.track-local.remote' NOT FOUND
F

  1) Failure:
config::rename::can_rename [/home/sallred/git/libgit2/tests/libgit2/config/rename.c:34]
  Function call failed: (git_config_rename_section( g_repo, "branch.track-local", "branch.local-track"))
  error -3 - could not find key 'branch.track-local.remote' to delete
diff --git a/src/libgit2/config_entries.c b/src/libgit2/config_entries.c
@@ -179,19 +179,36 @@ int git_config_entries_get_unique(git_config_entry **out, git_config_entries *en
 {
 	config_entry_map_head *entry;
 
-	if ((entry = git_strmap_get(entries->map, key)) == NULL)
-		return GIT_ENOTFOUND;
+	printf("\nlog: new call to git_config_entries_get_unique\n");
+	printf("log: needle: %s\n", key);
+	printf("log: haystack:\n");
+
+	char *key1; config_entry_map_head *value;
+	git_strmap_foreach(entries->map, key1, value, {
+	    printf("log:   %s => %s\n", key1, value->entry->value);
+	  });
+
+	printf("log: end\n");
+
+	if ((entry = git_strmap_get(entries->map, key)) == NULL) {
+	  printf("log: '%s' NOT FOUND\n", key);
+	  return GIT_ENOTFOUND;
+	}
 
 	if (entry->multivar) {
+	  printf("log: '%s' NOT UNIQUE: MULTIVAR\n", key);
+
 		git_error_set(GIT_ERROR_CONFIG, "entry is not unique due to being a multivar");
 		return -1;
 	}
 
 	if (entry->entry->include_depth) {
+	  printf("log: '%s' NOT UNIQUE: INCLUDED\n", key);
 		git_error_set(GIT_ERROR_CONFIG, "entry is not unique due to being included");
 		return -1;
 	}
 
+	printf("log: found %s=%s\n", entry->entry->name, entry->entry->value);
 	*out = entry->entry;
 
 	return 0;
