Commit Diff


commit - 5872d532b3085f346a9deaa043509a62d0dc9290d7f46cc9bb9578366dae2af3
commit + 6c1c3b032c05ecdacbe8627c13135075cd8020aa677cc2f79730596952928608
blob - c1dcc9faed6da5cfc5535858f602fc898c134e748fe02fafc8b330ef3e3b6201
blob + 20a91bf8e51ba0b015990b48ed47c997a93a32aff342d0c4d015c2a46e241a90
--- tog/tog.c	
+++ tog/tog.c	
@@ -4883,12 +4883,20 @@ log_mark_commit(struct tog_log_view_state *s)
 }
 
 static const struct got_error *
-set_tog_base_commit(struct got_worktree *worktree)
+set_tog_base_commit(struct got_worktree *worktree, enum got_hash_algorithm algo)
 {
 	tog_base_commit.id = got_object_id_dup(
 	    got_worktree_get_base_commit_id(worktree));
 	if (tog_base_commit.id == NULL)
-		return got_error_from_errno( "got_object_id_dup");
+		return got_error_from_errno("got_object_id_dup");
+	if (tog_base_commit.id->algo != algo) {
+		return got_error_fmt(GOT_ERR_HASH_ALGO,
+		    "this work tree was checked out from a repository "
+		    "with hash algorithm %s but the repository now uses "
+		    "hash algorithm %s",
+		    got_hash_algo_name(tog_base_commit.id->algo),
+		    got_hash_algo_name(algo));
+	}
 
 	return NULL;
 }
@@ -5077,7 +5085,8 @@ input_log_view(struct tog_view **new_view, struct tog_
 					got_worktree_close(worktree);
 					return err;
 				}
-				err  = set_tog_base_commit(worktree);
+				err  = set_tog_base_commit(worktree,
+				    got_repo_get_hash_algo(s->repo));
 				got_worktree_close(worktree);
 				if (err)
 					return err;
@@ -5403,7 +5412,8 @@ cmd_log(int argc, char *argv[])
 	}
 
 	if (worktree) {
-		error = set_tog_base_commit(worktree);
+		error = set_tog_base_commit(worktree,
+		    got_repo_get_hash_algo(repo));
 		if (error != NULL)
 			goto done;
 	}
@@ -7777,7 +7787,8 @@ cmd_diff(int argc, char *argv[])
 	}
 
 	if (worktree) {
-		error = set_tog_base_commit(worktree);
+		error = set_tog_base_commit(worktree,
+		    got_repo_get_hash_algo(repo));
 		if (error != NULL)
 			goto done;
 
@@ -8942,7 +8953,8 @@ cmd_blame(int argc, char *argv[])
 	}
 
 	if (worktree) {
-		error = set_tog_base_commit(worktree);
+		error = set_tog_base_commit(worktree,
+		    got_repo_get_hash_algo(repo));
 		if (error != NULL)
 			goto done;
 
@@ -9947,7 +9959,8 @@ cmd_tree(int argc, char *argv[])
 	}
 
 	if (worktree) {
-		error = set_tog_base_commit(worktree);
+		error = set_tog_base_commit(worktree,
+		    got_repo_get_hash_algo(repo));
 		if (error != NULL)
 			goto done;
 
@@ -10741,7 +10754,8 @@ cmd_ref(int argc, char *argv[])
 		goto done;
 
 	if (worktree) {
-		error = set_tog_base_commit(worktree);
+		error = set_tog_base_commit(worktree,
+		    got_repo_get_hash_algo(repo));
 		if (error != NULL)
 			goto done;