Accepting request 1146242 from devel:tools:scm

- update to 2.43.1:
  * https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.43.1.txt

OBS-URL: https://build.opensuse.org/request/show/1146242
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=307

completion-wordbreaks.diff

@@ -2,11 +2,11 @@
  contrib/completion/git-completion.bash |   10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: git-2.40.0/contrib/completion/git-completion.bash
+Index: git-2.43.1/contrib/completion/git-completion.bash
 ===================================================================
---- git-2.40.0.orig/contrib/completion/git-completion.bash
-+++ git-2.40.0/contrib/completion/git-completion.bash
-@@ -65,10 +65,12 @@
+--- git-2.43.1.orig/contrib/completion/git-completion.bash
++++ git-2.43.1/contrib/completion/git-completion.bash
+@@ -67,10 +67,12 @@
  #     case insensitively, even on systems with case sensitive file systems
  #     (e.g., completing tag name "FOO" on "git checkout f<TAB>").
  

git-2.43.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec
-size 7382996

git-2.43.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2234f37b453ff8e4672c21ad40d41cc7393c9a8dcdfe640bec7ac5b5358f30d2
+size 7388400

git-prevent_xss-default.diff

@@ -12,11 +12,11 @@ Signed-off-by: Jakub Narebski <jnareb@...il.com>
  gitweb/gitweb.perl |    2 +-
  3 files changed, 8 insertions(+), 3 deletions(-)
 
-Index: git-2.11.0/git-instaweb.sh
+Index: git-2.43.1/git-instaweb.sh
 ===================================================================
---- git-2.11.0.orig/git-instaweb.sh
-+++ git-2.11.0/git-instaweb.sh
-@@ -598,6 +598,10 @@ our \$projectroot = "$(dirname "$fqgitdi
+--- git-2.43.1.orig/git-instaweb.sh
++++ git-2.43.1/git-instaweb.sh
+@@ -721,6 +721,10 @@ our \$projectroot = "$(dirname "$fqgitdi
  our \$git_temp = "$fqgitdir/gitweb/tmp";
  our \$projects_list = \$projectroot;
  
@@ -27,11 +27,11 @@ Index: git-2.11.0/git-instaweb.sh
  \$feature{'remote_heads'}{'default'} = [1];
  EOF
  }
-Index: git-2.11.0/gitweb/gitweb.perl
+Index: git-2.43.1/gitweb/gitweb.perl
 ===================================================================
---- git-2.11.0.orig/gitweb/gitweb.perl
-+++ git-2.11.0/gitweb/gitweb.perl
-@@ -190,7 +190,7 @@ our @diff_opts = ('-M'); # taken from gi
+--- git-2.43.1.orig/gitweb/gitweb.perl
++++ git-2.43.1/gitweb/gitweb.perl
+@@ -194,7 +194,7 @@ our @diff_opts = ('-M'); # taken from gi
  
  # Disables features that would allow repository owners to inject script into
  # the gitweb domain.
@@ -39,4 +39,4 @@ Index: git-2.11.0/gitweb/gitweb.perl
 +our $prevent_xss = 1;
  
  # Path to the highlight executable to use (must be the one from
- # http://www.andre-simon.de due to assumptions about parameters and output).
+ # http://andre-simon.de/zip/download.php due to assumptions about parameters and output).

git.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 12 16:59:37 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.43.1:
+  * https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.43.1.txt
+
 -------------------------------------------------------------------
 Tue Jan  9 21:02:19 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
 

git.spec

@@ -35,7 +35,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.43.0
+Version:        2.43.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only

setup-don-t-fail-if-commondir-reference-is-deleted.patch

@@ -28,11 +28,11 @@ v3:
  setup.c | 16 +++++++++++-----
  1 file changed, 11 insertions(+), 5 deletions(-)
 
-diff --git a/setup.c b/setup.c
-index ca9e8a949ed8..49306e36990d 100644
---- a/setup.c
-+++ b/setup.c
-@@ -270,12 +270,20 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir)
+Index: git-2.43.1/setup.c
+===================================================================
+--- git-2.43.1.orig/setup.c
++++ git-2.43.1/setup.c
+@@ -316,12 +316,20 @@ int get_common_dir_noenv(struct strbuf *
  {
  	struct strbuf data = STRBUF_INIT;
  	struct strbuf path = STRBUF_INIT;
@@ -56,7 +56,7 @@ index ca9e8a949ed8..49306e36990d 100644
  		while (data.len && (data.buf[data.len - 1] == '\n' ||
  				    data.buf[data.len - 1] == '\r'))
  			data.len--;
-@@ -286,8 +294,6 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir)
+@@ -332,8 +340,6 @@ int get_common_dir_noenv(struct strbuf *
  		strbuf_addbuf(&path, &data);
  		strbuf_add_real_path(sb, path.buf);
  		ret = 1;
@@ -65,6 +65,3 @@ index ca9e8a949ed8..49306e36990d 100644
  	}
  
  	strbuf_release(&data);
--- 
-2.20.1
-