Merge pull request #852 from arrbee/submodule-extensions

Submodule extensions

include/git2/diff.h

@@ -391,6 +391,21 @@ GIT_EXTERN(int) git_diff_print_patch(
 	void *cb_data,
 	git_diff_data_fn print_cb);
 
+/**
+ * Query how many diff records are there in a diff list.
+ *
+ * You can optionally pass in a `git_delta_t` value if you want a count
+ * of just entries that match that delta type, or pass -1 for all delta
+ * records.
+ *
+ * @param diff A git_diff_list generated by one of the above functions
+ * @param delta_t A git_delta_t value to filter the count, or -1 for all records
+ * @return Count of number of deltas matching delta_t type
+ */
+GIT_EXTERN(int) git_diff_entrycount(
+	git_diff_list *diff,
+	int delta_t);
+
 /**@}*/
 
 

include/git2/errors.h

@@ -54,6 +54,7 @@ typedef enum {
 	GITERR_TREE,
 	GITERR_INDEXER,
 	GITERR_SSL,
+	GITERR_SUBMODULE,
 } git_error_t;
 
 /**

include/git2/oid.h

@@ -185,6 +185,8 @@ GIT_EXTERN(int) git_oid_streq(const git_oid *a, const char *str);
 
 /**
  * Check is an oid is all zeros.
+ *
+ * @return 1 if all zeros, 0 otherwise.
  */
 GIT_EXTERN(int) git_oid_iszero(const git_oid *a);
 

src/buffer.c

@@ -144,31 +144,40 @@ int git_buf_puts(git_buf *buf, const char *string)
 int git_buf_puts_escaped(
 	git_buf *buf, const char *string, const char *esc_chars, const char *esc_with)
 {
-	const char *scan = string;
-	size_t total = 0, esc_with_len = strlen(esc_with);
+	const char *scan;
+	size_t total = 0, esc_len = strlen(esc_with), count;
 
-	while (*scan) {
-		size_t count = strcspn(scan, esc_chars);
-		total += count + 1 + esc_with_len;
-		scan += count + 1;
+	if (!string)
+		return 0;
+
+	for (scan = string; *scan; ) {
+		/* count run of non-escaped characters */
+		count = strcspn(scan, esc_chars);
+		total += count;
+		scan += count;
+		/* count run of escaped characters */
+		count = strspn(scan, esc_chars);
+		total += count * (esc_len + 1);
+		scan += count;
 	}
 
 	ENSURE_SIZE(buf, buf->size + total + 1);
 
 	for (scan = string; *scan; ) {
-		size_t count = strcspn(scan, esc_chars);
+		count = strcspn(scan, esc_chars);
 
 		memmove(buf->ptr + buf->size, scan, count);
 		scan += count;
 		buf->size += count;
 
-		if (*scan) {
-			memmove(buf->ptr + buf->size, esc_with, esc_with_len);
-			buf->size += esc_with_len;
-
-			memmove(buf->ptr + buf->size, scan, 1);
-			scan += 1;
-			buf->size += 1;
+		for (count = strspn(scan, esc_chars); count > 0; --count) {
+			/* copy escape sequence */
+			memmove(buf->ptr + buf->size, esc_with, esc_len);
+			buf->size += esc_len;
+			/* copy character to be escaped */
+			buf->ptr[buf->size] = *scan;
+			buf->size++;
+			scan++;
 		}
 	}
 

src/checkout.c

@@ -31,7 +31,7 @@ typedef struct tree_walk_data
 	git_checkout_opts *opts;
 	git_repository *repo;
 	git_odb *odb;
-	bool do_symlinks;
+	bool no_symlinks;
 } tree_walk_data;
 
 
@@ -48,9 +48,9 @@ static int blob_contents_to_link(tree_walk_data *data, git_buf *fnbuf,
 			/* Create the link */
 			const char *new = git_buf_cstr(&linktarget),
 						  *old = git_buf_cstr(fnbuf);
-			retcode = data->do_symlinks
-				? p_symlink(new, old)
-				: git_futils_fake_symlink(new, old);
+			retcode = data->no_symlinks
+				? git_futils_fake_symlink(new, old)
+				: p_symlink(new, old);
 		}
 		git_buf_free(&linktarget);
 		git_blob_free(blob);
@@ -176,13 +176,14 @@ int git_checkout_head(git_repository *repo, git_checkout_opts *opts, git_indexer
 		return GIT_ERROR;
 	}
 
+	memset(&payload, 0, sizeof(payload));
+
 	/* Determine if symlinks should be handled */
-	if (!git_repository_config(&cfg, repo)) {
+	if (!git_repository_config__weakptr(&cfg, repo)) {
 		int temp = true;
 		if (!git_config_get_bool(&temp, cfg, "core.symlinks")) {
-			payload.do_symlinks = !!temp;
+			payload.no_symlinks = !temp;
 		}
-		git_config_free(cfg);
 	}
 
 	stats->total = stats->processed = 0;

src/config_file.c

@@ -195,7 +195,7 @@ static int file_foreach(
 	void *data)
 {
 	diskfile_backend *b = (diskfile_backend *)backend;
-	cvar_t *var;
+	cvar_t *var, *next_var;
 	const char *key;
 	regex_t regex;
 	int result = 0;
@@ -212,7 +212,9 @@ static int file_foreach(
 	}
 
 	git_strmap_foreach(b->values, key, var,
-		for (; var != NULL; var = CVAR_LIST_NEXT(var)) {
+		for (; var != NULL; var = next_var) {
+			next_var = CVAR_LIST_NEXT(var);
+
 			/* skip non-matching keys if regexp was provided */
 			if (regexp && regexec(&regex, key, 0, NULL, 0) != 0)
 				continue;
@@ -253,11 +255,17 @@ static int config_set(git_config_file *cfg, const char *name, const char *value)
 		char *tmp = NULL;
 
 		git__free(key);
+
 		if (existing->next != NULL) {
 			giterr_set(GITERR_CONFIG, "Multivar incompatible with simple set");
 			return -1;
 		}
 
+		/* don't update if old and new values already match */
+		if ((!existing->value && !value) ||
+			(existing->value && value && !strcmp(existing->value, value)))
+			return 0;
+
 		if (value) {
 			tmp = git__strdup(value);
 			GITERR_CHECK_ALLOC(tmp);

src/config_file.h

@@ -19,12 +19,24 @@ GIT_INLINE(void) git_config_file_free(git_config_file *cfg)
 	cfg->free(cfg);
 }
 
+GIT_INLINE(int) git_config_file_get_string(
+	const char **out, git_config_file *cfg, const char *name)
+{
+	return cfg->get(cfg, name, out);
+}
+
 GIT_INLINE(int) git_config_file_set_string(
 	git_config_file *cfg, const char *name, const char *value)
 {
 	return cfg->set(cfg, name, value);
 }
 
+GIT_INLINE(int) git_config_file_delete(
+	git_config_file *cfg, const char *name)
+{
+	return cfg->del(cfg, name);
+}
+
 GIT_INLINE(int) git_config_file_foreach(
 	git_config_file *cfg,
 	int (*fn)(const char *key, const char *value, void *data),

src/diff.c

@@ -530,7 +530,7 @@ static int maybe_modified(
 				status = GIT_DELTA_UNMODIFIED;
 			else if (git_submodule_lookup(&sub, diff->repo, nitem->path) < 0)
 				return -1;
-			else if (sub->ignore == GIT_SUBMODULE_IGNORE_ALL)
+			else if (git_submodule_ignore(sub) == GIT_SUBMODULE_IGNORE_ALL)
 				status = GIT_DELTA_UNMODIFIED;
 			else {
 				/* TODO: support other GIT_SUBMODULE_IGNORE values */

src/diff_output.c

@@ -718,6 +718,25 @@ int git_diff_print_patch(
 	return error;
 }
 
+int git_diff_entrycount(git_diff_list *diff, int delta_t)
+{
+	int count = 0;
+	unsigned int i;
+	git_diff_delta *delta;
+
+	assert(diff);
+
+	if (delta_t < 0)
+		return diff->deltas.length;
+
+	git_vector_foreach(&diff->deltas, i, delta) {
+		if (delta->status == (git_delta_t)delta_t)
+			count++;
+	}
+
+	return count;
+}
+
 int git_diff_blobs(
 	git_blob *old_blob,
 	git_blob *new_blob,

src/errors.c

@@ -110,6 +110,11 @@ void giterr_set_regex(const regex_t *regex, int error_code)
 void giterr_clear(void)
 {
 	GIT_GLOBAL->last_error = NULL;
+
+	errno = 0;
+#ifdef GIT_WIN32
+	SetLastError(0);
+#endif
 }
 
 const git_error *giterr_last(void)

src/filebuf.c

@@ -50,6 +50,7 @@ static int lock_file(git_filebuf *file, int flags)
 		if (flags & GIT_FILEBUF_FORCE)
 			p_unlink(file->path_lock);
 		else {
+			giterr_clear(); /* actual OS error code just confuses */
 			giterr_set(GITERR_OS,
 				"Failed to lock file '%s' for writing", file->path_lock);
 			return -1;

src/iterator.c

@@ -525,7 +525,9 @@ static int workdir_iterator__advance(
 	while ((wf = wi->stack) != NULL) {
 		next = git_vector_get(&wf->entries, ++wf->index);
 		if (next != NULL) {
-			if (strcmp(next->path, DOT_GIT "/") == 0)
+			/* match git's behavior of ignoring anything named ".git" */
+			if (strcmp(next->path, DOT_GIT "/") == 0 ||
+				strcmp(next->path, DOT_GIT) == 0)
 				continue;
 			/* else found a good entry */
 			break;
@@ -607,8 +609,8 @@ static int workdir_iterator__update_entry(workdir_iterator *wi)
 
 	wi->entry.path = ps->path;
 
-	/* skip over .git directory */
-	if (strcmp(ps->path, DOT_GIT "/") == 0)
+	/* skip over .git entry */
+	if (strcmp(ps->path, DOT_GIT "/") == 0 || strcmp(ps->path, DOT_GIT) == 0)
 		return workdir_iterator__advance((git_iterator *)wi, NULL);
 
 	/* if there is an error processing the entry, treat as ignored */
@@ -629,15 +631,10 @@ static int workdir_iterator__update_entry(workdir_iterator *wi)
 
 	/* detect submodules */
 	if (S_ISDIR(wi->entry.mode)) {
-		bool is_submodule = git_path_contains(&wi->path, DOT_GIT);
-
-		/* if there is no .git, still check submodules data */
-		if (!is_submodule) {
-			int res = git_submodule_lookup(NULL, wi->repo, wi->entry.path);
-			is_submodule = (res == 0);
-			if (res == GIT_ENOTFOUND)
-				giterr_clear();
-		}
+		int res = git_submodule_lookup(NULL, wi->repo, wi->entry.path);
+		bool is_submodule = (res == 0);
+		if (res == GIT_ENOTFOUND)
+			giterr_clear();
 
 		/* if submodule, mark as GITLINK and remove trailing slash */
 		if (is_submodule) {

src/repository.c

@@ -146,8 +146,13 @@ static int load_workdir(git_repository *repo, git_buf *parent_path)
 		return -1;
 
 	error = git_config_get_string(&worktree, config, "core.worktree");
-	if (!error && worktree != NULL)
-		repo->workdir = git__strdup(worktree);
+	if (!error && worktree != NULL) {
+		error = git_path_prettify_dir(
+			&worktree_buf, worktree, repo->path_repository);
+		if (error < 0)
+			return error;
+		repo->workdir = git_buf_detach(&worktree_buf);
+	}
 	else if (error != GIT_ENOTFOUND)
 		return error;
 	else {

src/submodule.h

+/*
+ * Copyright (C) 2012 the libgit2 contributors
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_submodule_h__
+#define INCLUDE_submodule_h__
+
+/* Notes:
+ *
+ * Submodule information can be in four places: the index, the config files
+ * (both .git/config and .gitmodules), the HEAD tree, and the working
+ * directory.
+ *
+ * In the index:
+ * - submodule is found by path
+ * - may be missing, present, or of the wrong type
+ * - will have an oid if present
+ *
+ * In the HEAD tree:
+ * - submodule is found by path
+ * - may be missing, present, or of the wrong type
+ * - will have an oid if present
+ *
+ * In the config files:
+ * - submodule is found by submodule "name" which is usually the path
+ * - may be missing or present
+ * - will have a name, path, url, and other properties
+ *
+ * In the working directory:
+ * - submodule is found by path
+ * - may be missing, an empty directory, a checked out directory,
+ *   or of the wrong type
+ * - if checked out, will have a HEAD oid
+ * - if checked out, will have git history that can be used to compare oids
+ * - if checked out, may have modified files and/or untracked files
+ */
+
+/**
+ * Description of submodule
+ *
+ * This record describes a submodule found in a repository.  There should be
+ * an entry for every submodule found in the HEAD and index, and for every
+ * submodule described in .gitmodules.  The fields are as follows:
+ *
+ * - `owner` is the git_repository containing this submodule
+ * - `name` is the name of the submodule from .gitmodules.
+ * - `path` is the path to the submodule from the repo root.  It is almost
+ *    always the same as `name`.
+ * - `url` is the url for the submodule.
+ * - `tree_oid` is the SHA1 for the submodule path in the repo HEAD.
+ * - `index_oid` is the SHA1 for the submodule recorded in the index.
+ * - `workdir_oid` is the SHA1 for the HEAD of the checked out submodule.
+ * - `update` is a git_submodule_update_t value - see gitmodules(5) update.
+ * - `ignore` is a git_submodule_ignore_t value - see gitmodules(5) ignore.
+ * - `fetch_recurse` is 0 or 1 - see gitmodules(5) fetchRecurseSubmodules.
+ * - `refcount` tracks how many hashmap entries there are for this submodule.
+ *   It only comes into play if the name and path of the submodule differ.
+ * - `flags` is for internal use, tracking where this submodule has been
+ *   found (head, index, config, workdir) and other misc info about it.
+ *
+ * If the submodule has been added to .gitmodules but not yet git added,
+ * then the `index_oid` will be valid and zero.  If the submodule has been
+ * deleted, but the delete has not been committed yet, then the `index_oid`
+ * will be set, but the `url` will be NULL.
+ */
+struct git_submodule {
+	git_repository *owner;
+	char *name;
+	char *path; /* important: may point to same string data as "name" */
+	char *url;
+	uint32_t flags;
+	git_oid head_oid;
+	git_oid index_oid;
+	git_oid wd_oid;
+	/* information from config */
+	git_submodule_update_t update;
+	git_submodule_update_t update_default;
+	git_submodule_ignore_t ignore;
+	git_submodule_ignore_t ignore_default;
+	int fetch_recurse;
+	/* internal information */
+	int refcount;
+};
+
+/* Additional flags on top of public GIT_SUBMODULE_STATUS values */
+enum {
+	GIT_SUBMODULE_STATUS__WD_SCANNED          = (1u << 20),
+	GIT_SUBMODULE_STATUS__HEAD_OID_VALID      = (1u << 21),
+	GIT_SUBMODULE_STATUS__INDEX_OID_VALID     = (1u << 22),
+	GIT_SUBMODULE_STATUS__WD_OID_VALID        = (1u << 23),
+	GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE  = (1u << 24),
+	GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE = (1u << 25),
+	GIT_SUBMODULE_STATUS__WD_NOT_SUBMODULE    = (1u << 26),
+	GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES = (1u << 27),
+};
+
+#define GIT_SUBMODULE_STATUS__CLEAR_INTERNAL(S) \
+	((S) & ~(0xFFFFFFFFu << 20))
+
+#endif

tests-clar/resources/submod2/.gitted/HEAD

+ref: refs/heads/master

tests-clar/resources/submod2/.gitted/config

+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+[submodule "sm_missing_commits"]
+	url = ../submod2_target
+[submodule "sm_unchanged"]
+	url = ../submod2_target
+[submodule "sm_changed_file"]
+	url = ../submod2_target
+[submodule "sm_changed_index"]
+	url = ../submod2_target
+[submodule "sm_changed_head"]
+	url = ../submod2_target
+[submodule "sm_changed_untracked_file"]
+	url = ../submod2_target
+[submodule "sm_added_and_uncommited"]
+	url = ../submod2_target

tests-clar/resources/submod2/.gitted/description

+Unnamed repository; edit this file 'description' to name the repository.

tests-clar/resources/submod2/.gitted/hooks/applypatch-msg.sample

+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

tests-clar/resources/submod2/.gitted/info/exclude

+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

tests-clar/resources/submod2/.gitted/logs/HEAD

+0000000000000000000000000000000000000000 14fe9ccf104058df25e0a08361c4494e167ef243 Russell Belfer <rb@github.com> 1342559771 -0700	commit (initial): Initial commit
+14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer <rb@github.com> 1342559831 -0700	commit: Adding a submodule
+a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer <rb@github.com> 1342560036 -0700	commit: Updating submodule
+5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer <rb@github.com> 1342560288 -0700	commit: Adding a bunch more test content

tests-clar/resources/submod2/.gitted/logs/refs/heads/master

+0000000000000000000000000000000000000000 14fe9ccf104058df25e0a08361c4494e167ef243 Russell Belfer <rb@github.com> 1342559771 -0700	commit (initial): Initial commit
+14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer <rb@github.com> 1342559831 -0700	commit: Adding a submodule
+a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer <rb@github.com> 1342560036 -0700	commit: Updating submodule
+5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer <rb@github.com> 1342560288 -0700	commit: Adding a bunch more test content

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/HEAD

+ref: refs/heads/master

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/config

+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	worktree = ../../../sm_added_and_uncommited
+	ignorecase = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/description

+Unnamed repository; edit this file 'description' to name the repository.

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/hooks/applypatch-msg.sample

+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/info/exclude

+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/HEAD

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560316 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/heads/master

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560316 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560316 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/packed-refs

+# pack-refs with: peeled 
+480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/heads/master

+480095882d281ed676fe5b863569520e54a7d5c0

tests-clar/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/remotes/origin/HEAD

+ref: refs/remotes/origin/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/HEAD

+ref: refs/heads/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/config

+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	worktree = ../../../sm_changed_file
+	ignorecase = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/description

+Unnamed repository; edit this file 'description' to name the repository.

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/hooks/applypatch-msg.sample

+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/info/exclude

+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/logs/HEAD

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560173 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/heads/master

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560173 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/remotes/origin/HEAD

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560173 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/packed-refs

+# pack-refs with: peeled 
+480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/refs/heads/master

+480095882d281ed676fe5b863569520e54a7d5c0

tests-clar/resources/submod2/.gitted/modules/sm_changed_file/refs/remotes/origin/HEAD

+ref: refs/remotes/origin/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/COMMIT_EDITMSG

+Making a change in a submodule

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/HEAD

+ref: refs/heads/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/config

+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	worktree = ../../../sm_changed_head
+	ignorecase = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/description

+Unnamed repository; edit this file 'description' to name the repository.

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/hooks/applypatch-msg.sample

+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/info/exclude

+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/logs/HEAD

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560179 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target
+480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer <rb@github.com> 1342560431 -0700	commit: Making a change in a submodule

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/heads/master

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560179 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target
+480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer <rb@github.com> 1342560431 -0700	commit: Making a change in a submodule

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/remotes/origin/HEAD

+0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342560179 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/packed-refs

+# pack-refs with: peeled 
+480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/refs/heads/master

+3d9386c507f6b093471a3e324085657a3c2b4247

tests-clar/resources/submod2/.gitted/modules/sm_changed_head/refs/remotes/origin/HEAD

+ref: refs/remotes/origin/master