Merge pull request #1628 from EliahKagan/update-git-cmp-rs-url

Update and improve another few URLs

Sebastian Thiel committed 2 years ago

Commit 4cff32c2 parents 795962b baa6f232 files · +3 −3Browse files

Unified · Split

2 files

Makefile +1 −1
gix-diff/src/tree/function.rs +2 −2

@@ -145,7 +145,7 @@ base_url = https://github.com/GitoxideLabs/gitoxide.git · 144 unmodified lines
145	update-curl-fixtures: ## use curl to fetch raw fixtures for use in unit test. Changes there might break them	145	update-curl-fixtures: ## use curl to fetch raw fixtures for use in unit test. Changes there might break them
146	curl -D - -L "$(base_url)/info/refs?service=git-upload-pack" > $(transport_fixtures)/v1/http-handshake.response	146	curl -D - -L "$(base_url)/info/refs?service=git-upload-pack" > $(transport_fixtures)/v1/http-handshake.response
147	curl -D - -H 'Git-Protocol: version=2' -L "$(base_url)/info/refs?service=git-upload-pack" > $(transport_fixtures)/v2/http-handshake.response	147	curl -D - -H 'Git-Protocol: version=2' -L "$(base_url)/info/refs?service=git-upload-pack" > $(transport_fixtures)/v2/http-handshake.response
148	curl -H 'User-Agent: git/oxide-0.1.0' -D - -H 'Git-Protocol: version=1' -L "https://github.com/GitoxideLabs/foo/info/refs?service=git-upload-pack" > $(transport_fixtures)/http-401.response	148	curl -H 'User-Agent: git/oxide-0.1.0' -D - -H 'Git-Protocol: version=1' -L "https://github.com/GitoxideLabs/nonexistent/info/refs?service=git-upload-pack" > $(transport_fixtures)/http-401.response
149	curl -D - -H 'Git-Protocol: version=1' -L "https://github.com/GitoxideLabs/gitoxide/info/refs?service=git-upload-pack" > $(transport_fixtures)/http-404.response	149	curl -D - -H 'Git-Protocol: version=1' -L "https://github.com/GitoxideLabs/gitoxide/info/refs?service=git-upload-pack" > $(transport_fixtures)/http-404.response
150		150
151	update-assets: $(baseline_asset_fixture) ## refresh assets compiled into the binaries from their source	151	update-assets: $(baseline_asset_fixture) ## refresh assets compiled into the binaries from their source

gix-diff/src/tree/function.rs+2−2

@@ -23,8 +23,8 @@ use crate::tree::{visit::Change, Error, State, TreeInfoTuple, Visit}; · 22 unmodified lines
23	/// * cycle checking is not performed, but can be performed in the delegate which can return	23	/// * cycle checking is not performed, but can be performed in the delegate which can return
24	/// [`tree::visit::Action::Cancel`](crate::tree::visit::Action::Cancel) to stop the traversal.	24	/// [`tree::visit::Action::Cancel`](crate::tree::visit::Action::Cancel) to stop the traversal.
25	///	25	///
26	/// [git_cmp_c]: https://github.com/git/git/blob/311531c9de557d25ac087c1637818bd2aad6eb3a/tree-diff.c#L49:L65	26	/// [git_cmp_c]: https://github.com/git/git/blob/ef8ce8f3d4344fd3af049c17eeba5cd20d98b69f/tree-diff.c#L72-L88
27	/// [git_cmp_rs]: https://github.com/GitoxideLabs/gitoxide/blob/a4d5f99c8dc99bf814790928a3bf9649cd99486b/gix-object/src/mutable/tree.rs#L52-L55	27	/// [git_cmp_rs]: https://github.com/GitoxideLabs/gitoxide/blob/795962b107d86f58b1f7c75006da256d19cc80ad/gix-object/src/tree/mod.rs#L263-L273
28	#[doc(alias = "diff_tree_to_tree", alias = "git2")]	28	#[doc(alias = "diff_tree_to_tree", alias = "git2")]
29	pub fn diff<StateMut>(	29	pub fn diff<StateMut>(
30	lhs: TreeRefIter<'_>,	30	lhs: TreeRefIter<'_>,