add

Author: rraab-dev

emscriptenbuild/build.sh

@@ -44,5 +44,5 @@ done
 # Before building, remove any ../libgit2/src/ transports/emscriptenhttp.c left from running setup.sh 
 [ -f "../libgit2/src/libgit2/transports/emscriptenhttp-async.c" ] && rm ../libgit2/src/libgit2/transports/emscriptenhttp-async.c
 
-emcmake cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_FLAGS="$EXTRA_CMAKE_C_FLAGS --pre-js $(pwd)/pre.js $POST_JS -s \"EXPORTED_RUNTIME_METHODS=['FS','MEMFS','IDBFS','NODEFS','callMain']\" -sFORCE_FILESYSTEM -sEXPORT_ES6 -s INVOKE_RUN=0 -s ALLOW_MEMORY_GROWTH=1 -s STACK_SIZE=131072 -lidbfs.js -lnodefs.js -flto" -DREGEX_BACKEND=regcomp -DSONAME=OFF -DUSE_HTTPS=OFF -DBUILD_SHARED_LIBS=OFF -DTHREADSAFE=OFF -DUSE_SSH=OFF -DBUILD_CLAR=OFF -DBUILD_EXAMPLES=ON ..
+emcmake cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_FLAGS="$EXTRA_CMAKE_C_FLAGS --pre-js $(pwd)/pre.js $POST_JS -s \"EXPORTED_RUNTIME_METHODS=['FS','MEMFS','IDBFS','NODEFS','callMain']\" -sFORCE_FILESYSTEM -sEXPORT_ES6 -sINVOKE_RUN=0 -sALLOW_MEMORY_GROWTH=1 -sSTACK_SIZE=5MB -lidbfs.js -lnodefs.js -flto" -DREGEX_BACKEND=regcomp -DSONAME=OFF -DUSE_HTTPS=OFF -DBUILD_SHARED_LIBS=OFF -DTHREADSAFE=OFF -DUSE_SSH=OFF -DBUILD_CLAR=OFF -DBUILD_EXAMPLES=ON ..
 emmake make lg2

libgit2patchedfiles/examples/common.h

@@ -72,6 +72,7 @@ extern int lg2_init(git_repository *repo, int argc, char **argv);
 extern int lg2_log(git_repository *repo, int argc, char **argv);
 extern int lg2_log_last_commit_of_branch(git_repository *repo, int argc, char **argv);
 extern int lg2_log_git_merge_base(git_repository *repo, int argc, char **argv);
+extern int lg2_log_git_merge_base_commits(git_repository *repo, int argc, char **argv);
 extern int lg2_ls_files(git_repository *repo, int argc, char **argv);
 extern int lg2_ls_remote(git_repository *repo, int argc, char **argv);
 extern int lg2_merge(git_repository *repo, int argc, char **argv);

libgit2patchedfiles/examples/lg2.c

@@ -28,6 +28,7 @@ struct {
 	{ "log",          lg2_log,          1 },
 	{ "log-last-commit-of-branch", lg2_log_last_commit_of_branch, 1 },
 	{ "log-git-merge-base", lg2_log_git_merge_base, 1 },
+	{ "log-git-merge-base-commits", lg2_log_git_merge_base_commits, 1 },
 	{ "ls-files",     lg2_ls_files,     1 },
 	{ "ls-remote",    lg2_ls_remote,    1 },
 	{ "merge",        lg2_merge,        1 },

libgit2patchedfiles/examples/log-git-merge-base-commits.c

@@ -0,0 +1,96 @@
+/*
+ * libgit2 "log" example - shows how to walk history and get commit info
+ *
+ * Written by the libgit2 contributors
+ *
+ * To the extent possible under law, the author(s) have dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty.
+ *
+ * You should have received a copy of the CC0 Public Domain Dedication along
+ * with this software. If not, see
+ * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include "common.h"
+
+/** utility functions that parse options and help with log output */
+static void print_time(const git_time *intime, const char *prefix);
+static void print_commit_info(git_commit *commit);
+
+int lg2_log_git_merge_base_commits(git_repository *repo, int argc, char *argv[])
+{
+	git_oid merge_base_oid;
+	char* commit_id_1 = NULL;
+	char* commit_id_2 = NULL;
+	git_commit *commit_1 = NULL;
+    git_commit *commit_2 = NULL;
+	git_oid oid_1;
+    git_oid oid_2;
+	int error;
+
+	if (argc != 3) {
+		fprintf(stderr, "You have to specify exactly two commit ids. Usage: git log-git-merge-base <commitId1> <commitId2>\n");
+        goto cleanup;
+	} else {
+		commit_id_1 = argv[1];
+		commit_id_2 = argv[2];
+	}
+
+	// Lookup commit_id_1 commit by hash
+    error = git_oid_fromstr(&oid_1, commit_id_1);
+    if (error < 0) {
+        fprintf(stderr, "Failed to convert commitId1 commit hash.\n");
+        goto cleanup;
+    }
+
+    error = git_commit_lookup(&commit_1, repo, &oid_1);
+    if (error < 0) {
+        fprintf(stderr, "Failed to lookup commitId1 commit.\n");
+        goto cleanup;
+    }
+
+    // Lookup commit_id_2 commit by hash
+    error = git_oid_fromstr(&oid_2, commit_id_2);
+    if (error < 0) {
+        fprintf(stderr, "Failed to convert commitId2 commit hash.\n");
+        goto cleanup;
+    }
+
+    error = git_commit_lookup(&commit_2, repo, &oid_2);
+    if (error < 0) {
+        fprintf(stderr, "Failed to lookup commitId2 commit.\n");
+        goto cleanup;
+    }
+
+    // Find the merge base between commitId1 and commitId2
+    error = git_merge_base(&merge_base_oid, repo, &oid_1, &oid_2);
+    if (error < 0) {
+        fprintf(stderr, "Failed to find merge base.\n");
+        goto cleanup;
+    }
+
+    // Setup revwalker
+    git_revwalk *walker;
+    git_revwalk_new(&walker, repo);
+    git_revwalk_sorting(walker, GIT_SORT_TIME | GIT_SORT_REVERSE);
+    git_revwalk_push(walker, &oid_2);
+    git_revwalk_hide(walker, &merge_base_oid);
+
+    // Log commit list
+    git_oid oid;
+    git_commit *commit;
+
+    while (!git_revwalk_next(&oid, walker)) {
+        git_commit_lookup(&commit, repo, &oid);
+        print_commit_info(commit);
+        git_commit_free(commit);
+    }
+
+cleanup:
+    git_commit_free(commit_1);
+    git_commit_free(commit_2);
+    if (walker) git_revwalk_free(walker);
+
+	return 0;
+}