Compare commits
6 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
100f8d8922 | ||
|
|
c9e0aaf044 | ||
|
|
761a711d9d | ||
|
|
0b3f8a3c9c | ||
|
|
861fbcbf27 | ||
|
|
64e241f68b |
22 changed files with 1167 additions and 1976 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -1,8 +1,7 @@
|
||||||
*~
|
*~
|
||||||
*.gpg
|
|
||||||
*.rpm
|
*.rpm
|
||||||
*.sign
|
*.tar.bz2
|
||||||
*.tar.xz
|
|
||||||
/.build*.log
|
/.build*.log
|
||||||
/git-*/
|
/git-*/
|
||||||
/results_git/
|
/git-1.7.6.4.tar.gz
|
||||||
|
/git-1.7.6.5.tar.gz
|
||||||
|
|
|
||||||
18
.mailmap
18
.mailmap
|
|
@ -1,18 +0,0 @@
|
||||||
<atkac@redhat.com> <atkac@fedoraproject.org>
|
|
||||||
<atkac@redhat.com> <vonsch@gmail.com>
|
|
||||||
<bernie@codewiz.org> <bernie@fedoraproject.org>
|
|
||||||
<Christian.Iseli@licr.org> <c4chris@fedoraproject.org>
|
|
||||||
<dennis@ausil.us> <ausil@fedoraproject.org>
|
|
||||||
<dwmw2@infradead.org> <David.Woodhouse@intel.com>
|
|
||||||
James Bowes <jbowes@redhat.com> <jbowes@fedoraproject.org>
|
|
||||||
<jkeating@redhat.com> <jkeating@fedoraproject.org>
|
|
||||||
Josh Boyer <jwboyer@gmail.com> <jwboyer@fedoraproject.org>
|
|
||||||
<katzj@redhat.com> <katzj@fedoraproject.org>
|
|
||||||
<lkundrak@redhat.com> <lkundrak@fedoraproject.org>
|
|
||||||
<mmaslano@redhat.com> <mmaslano@fedoraproject.org>
|
|
||||||
<releng@fedoraproject.org> <rel-eng@lists.fedoraproject.org>
|
|
||||||
<skasal@redhat.com> <kasal@fedoraproject.org>
|
|
||||||
<tmraz@redhat.com> <tmraz@fedoraproject.org>
|
|
||||||
<tmz@pobox.com> <tmz@fedoraproject.org>
|
|
||||||
<ville.skytta@iki.fi> <scop@fedoraproject.org>
|
|
||||||
<xavier@bachelot.org> <xavierb@fedoraproject.org>
|
|
||||||
|
|
@ -1,73 +0,0 @@
|
||||||
From 89ccbc15948db9ddbf74530e3fd66dd78ae897ae Mon Sep 17 00:00:00 2001
|
|
||||||
From: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Date: Sun, 21 Aug 2022 13:49:57 -0400
|
|
||||||
Subject: [PATCH] t/lib-httpd: try harder to find a port for apache
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
When running multiple builds concurrently, tests which run daemons, like
|
|
||||||
apache httpd, sometimes conflict with each other, leading to spurious
|
|
||||||
failures:
|
|
||||||
|
|
||||||
++ /usr/sbin/httpd -d '/tmp/git-t.ck9I/trash directory.t9118-git-svn-funky-branch-names/httpd' \
|
|
||||||
-f /builddir/build/BUILD/git-2.37.2/t/lib-httpd/apache.conf -DDAV -DSVN -c 'Listen 127.0.0.1:9118' \
|
|
||||||
-k start
|
|
||||||
(98)Address already in use: AH00072: make_sock: could not bind to address 127.0.0.1:9118
|
|
||||||
no listening sockets available, shutting down
|
|
||||||
AH00015: Unable to open logs
|
|
||||||
++ test 1 -ne 0
|
|
||||||
|
|
||||||
Try a bit harder to find an open port to use to avoid these intermittent
|
|
||||||
failures. If we fail to start httpd, increment the port number and try
|
|
||||||
again. By default, we make 3 attempts. This may be overridden by
|
|
||||||
setting GIT_TEST_START_HTTPD_TRIES to a different value.
|
|
||||||
|
|
||||||
Helped-by: Ondřej Pohořelský <opohorel@redhat.com>
|
|
||||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
||||||
---
|
|
||||||
t/lib-httpd.sh | 29 ++++++++++++++++++-----------
|
|
||||||
1 file changed, 18 insertions(+), 11 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
|
|
||||||
index 2fb1b2ae56..4afdf5a6aa 100644
|
|
||||||
--- a/t/lib-httpd.sh
|
|
||||||
+++ b/t/lib-httpd.sh
|
|
||||||
@@ -206,19 +206,26 @@ enable_cgipassauth () {
|
|
||||||
}
|
|
||||||
|
|
||||||
start_httpd() {
|
|
||||||
- prepare_httpd >&3 2>&4
|
|
||||||
-
|
|
||||||
test_atexit stop_httpd
|
|
||||||
|
|
||||||
- "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
|
|
||||||
- -f "$TEST_PATH/apache.conf" $HTTPD_PARA \
|
|
||||||
- -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
|
|
||||||
- >&3 2>&4
|
|
||||||
- if test $? -ne 0
|
|
||||||
- then
|
|
||||||
- cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
|
|
||||||
- test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
|
|
||||||
- fi
|
|
||||||
+ i=0
|
|
||||||
+ while test $i -lt ${GIT_TEST_START_HTTPD_TRIES:-3}
|
|
||||||
+ do
|
|
||||||
+ i=$(($i + 1))
|
|
||||||
+ prepare_httpd >&3 2>&4
|
|
||||||
+ say >&3 "Starting httpd on port $LIB_HTTPD_PORT"
|
|
||||||
+ "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
|
|
||||||
+ -f "$TEST_PATH/apache.conf" $HTTPD_PARA \
|
|
||||||
+ -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
|
|
||||||
+ >&3 2>&4
|
|
||||||
+ test $? -eq 0 && return
|
|
||||||
+ LIB_HTTPD_PORT=$(($LIB_HTTPD_PORT + 1))
|
|
||||||
+ export LIB_HTTPD_PORT
|
|
||||||
+ # clean up modules symlink, prepare_httpd will re-create it
|
|
||||||
+ rm -f "$HTTPD_ROOT_PATH/modules"
|
|
||||||
+ done
|
|
||||||
+ cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
|
|
||||||
+ test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_httpd() {
|
|
||||||
|
|
@ -1,88 +0,0 @@
|
||||||
From e90e1068ddc9cfa3badd23b16a46c57ed6d8308a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Date: Fri, 26 Aug 2022 18:28:44 -0400
|
|
||||||
Subject: [PATCH] t/lib-git-daemon: try harder to find a port
|
|
||||||
|
|
||||||
As with the previous commit, try harder to find an open port to avoid
|
|
||||||
intermittent failures on busy/shared build systems.
|
|
||||||
|
|
||||||
By default, we make 3 attempts. This may be overridden by setting
|
|
||||||
GIT_TEST_START_GIT_DAEMON_TRIES to a different value.
|
|
||||||
|
|
||||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
||||||
---
|
|
||||||
t/lib-git-daemon.sh | 60 ++++++++++++++++++++++++++++-----------------
|
|
||||||
1 file changed, 37 insertions(+), 23 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
|
|
||||||
index e62569222b..c3e8dda9ff 100644
|
|
||||||
--- a/t/lib-git-daemon.sh
|
|
||||||
+++ b/t/lib-git-daemon.sh
|
|
||||||
@@ -51,30 +51,44 @@ start_git_daemon() {
|
|
||||||
registered_stop_git_daemon_atexit_handler=AlreadyDone
|
|
||||||
fi
|
|
||||||
|
|
||||||
- say >&3 "Starting git daemon ..."
|
|
||||||
- mkfifo git_daemon_output
|
|
||||||
- ${LIB_GIT_DAEMON_COMMAND:-git daemon} \
|
|
||||||
- --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
|
|
||||||
- --reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \
|
|
||||||
- --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
- "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
- >&3 2>git_daemon_output &
|
|
||||||
- GIT_DAEMON_PID=$!
|
|
||||||
- {
|
|
||||||
- read -r line <&7
|
|
||||||
- printf "%s\n" "$line" >&4
|
|
||||||
- cat <&7 >&4 &
|
|
||||||
- } 7<git_daemon_output &&
|
|
||||||
+ i=0
|
|
||||||
+ while test $i -lt ${GIT_TEST_START_GIT_DAEMON_TRIES:-3}
|
|
||||||
+ do
|
|
||||||
+ say >&3 "Starting git daemon on port $LIB_GIT_DAEMON_PORT ..."
|
|
||||||
+ mkfifo git_daemon_output
|
|
||||||
+ ${LIB_GIT_DAEMON_COMMAND:-git daemon} \
|
|
||||||
+ --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
|
|
||||||
+ --reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \
|
|
||||||
+ --base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
+ "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
||||||
+ >&3 2>git_daemon_output &
|
|
||||||
+ GIT_DAEMON_PID=$!
|
|
||||||
+ {
|
|
||||||
+ read -r line <&7
|
|
||||||
+ printf "%s\n" "$line" >&4
|
|
||||||
+ cat <&7 >&4 &
|
|
||||||
+ } 7<git_daemon_output &&
|
|
||||||
|
|
||||||
- # Check expected output
|
|
||||||
- if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
|
|
||||||
- then
|
|
||||||
- kill "$GIT_DAEMON_PID"
|
|
||||||
- wait "$GIT_DAEMON_PID"
|
|
||||||
- unset GIT_DAEMON_PID
|
|
||||||
- test_skip_or_die GIT_TEST_GIT_DAEMON \
|
|
||||||
- "git daemon failed to start"
|
|
||||||
- fi
|
|
||||||
+ # Check expected output
|
|
||||||
+ output="$(expr "$line" : "\[[0-9]*\] \(.*\)")"
|
|
||||||
+ # Return if found
|
|
||||||
+ test x"$output" = x"Ready to rumble" && return
|
|
||||||
+ # Increment port for retry if not found
|
|
||||||
+ LIB_GIT_DAEMON_PORT=$(($LIB_GIT_DAEMON_PORT + 1))
|
|
||||||
+ export LIB_GIT_DAEMON_PORT
|
|
||||||
+ GIT_DAEMON_HOST_PORT=127.0.0.1:$LIB_GIT_DAEMON_PORT
|
|
||||||
+ GIT_DAEMON_URL=git://$GIT_DAEMON_HOST_PORT
|
|
||||||
+ # unset GIT_DAEMON_PID; remove the fifo & pid file
|
|
||||||
+ GIT_DAEMON_PID=
|
|
||||||
+ rm -f git_daemon_output "$GIT_DAEMON_PIDFILE"
|
|
||||||
+ done
|
|
||||||
+
|
|
||||||
+ # Clean up and return failure
|
|
||||||
+ kill "$GIT_DAEMON_PID"
|
|
||||||
+ wait "$GIT_DAEMON_PID"
|
|
||||||
+ unset GIT_DAEMON_PID
|
|
||||||
+ test_skip_or_die GIT_TEST_GIT_DAEMON \
|
|
||||||
+ "git daemon failed to start"
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_git_daemon() {
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
From 41423d666fd52eaa6aa2b44a0de1b81d0857ca06 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Date: Fri, 26 Aug 2022 18:28:44 -0400
|
|
||||||
Subject: [PATCH] t/lib-git-svn: try harder to find a port
|
|
||||||
|
|
||||||
As with the previous commits, try harder to find an open port to avoid
|
|
||||||
intermittent failures on busy/shared build systems.
|
|
||||||
|
|
||||||
By default, we make 3 attempts. This may be overridden by setting
|
|
||||||
GIT_TEST_START_SVNSERVE_TRIES to a different value.
|
|
||||||
|
|
||||||
Run svnserve in daemon mode and use 'test_atexit' to stop it. This is
|
|
||||||
cleaner than running in the foreground with --listen-once and having to
|
|
||||||
manage the PID ourselves.
|
|
||||||
|
|
||||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
||||||
---
|
|
||||||
t/lib-git-svn.sh | 34 +++++++++++++++++++++++++----
|
|
||||||
t/t9113-git-svn-dcommit-new-file.sh | 1 -
|
|
||||||
2 files changed, 30 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
|
|
||||||
index ea28971e8e..04e660e2ba 100644
|
|
||||||
--- a/t/lib-git-svn.sh
|
|
||||||
+++ b/t/lib-git-svn.sh
|
|
||||||
@@ -17,6 +17,7 @@ fi
|
|
||||||
GIT_DIR=$PWD/.git
|
|
||||||
GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
|
|
||||||
SVN_TREE=$GIT_SVN_DIR/svn-tree
|
|
||||||
+SVNSERVE_PIDFILE="$PWD"/daemon.pid
|
|
||||||
test_set_port SVNSERVE_PORT
|
|
||||||
|
|
||||||
svn >/dev/null 2>&1
|
|
||||||
@@ -119,10 +120,35 @@ require_svnserve () {
|
|
||||||
}
|
|
||||||
|
|
||||||
start_svnserve () {
|
|
||||||
- svnserve --listen-port $SVNSERVE_PORT \
|
|
||||||
- --root "$rawsvnrepo" \
|
|
||||||
- --listen-once \
|
|
||||||
- --listen-host 127.0.0.1 &
|
|
||||||
+ test_atexit stop_svnserve
|
|
||||||
+
|
|
||||||
+ i=0
|
|
||||||
+ while test $i -lt ${GIT_TEST_START_SVNSERVE_TRIES:-3}
|
|
||||||
+ do
|
|
||||||
+ say >&3 "Starting svnserve on port $SVNSERVE_PORT ..."
|
|
||||||
+ svnserve --listen-port $SVNSERVE_PORT \
|
|
||||||
+ --root "$rawsvnrepo" \
|
|
||||||
+ --daemon --pid-file="$SVNSERVE_PIDFILE" \
|
|
||||||
+ --listen-host 127.0.0.1
|
|
||||||
+ ret=$?
|
|
||||||
+ # increment port and retry if unsuccessful
|
|
||||||
+ if test $ret -ne 0
|
|
||||||
+ then
|
|
||||||
+ SVNSERVE_PORT=$(($SVNSERVE_PORT + 1))
|
|
||||||
+ export SVNSERVE_PORT
|
|
||||||
+ else
|
|
||||||
+ break
|
|
||||||
+ fi
|
|
||||||
+ done
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+stop_svnserve () {
|
|
||||||
+ say >&3 "Stopping svnserve ..."
|
|
||||||
+ SVNSERVE_PID="$(cat "$SVNSERVE_PIDFILE")"
|
|
||||||
+ if test -n "$SVNSERVE_PID"
|
|
||||||
+ then
|
|
||||||
+ kill "$SVNSERVE_PID" 2>/dev/null
|
|
||||||
+ fi
|
|
||||||
}
|
|
||||||
|
|
||||||
prepare_utf8_locale () {
|
|
||||||
diff --git a/t/t9113-git-svn-dcommit-new-file.sh b/t/t9113-git-svn-dcommit-new-file.sh
|
|
||||||
index e8479cec7a..5925891f5d 100755
|
|
||||||
--- a/t/t9113-git-svn-dcommit-new-file.sh
|
|
||||||
+++ b/t/t9113-git-svn-dcommit-new-file.sh
|
|
||||||
@@ -28,7 +28,6 @@ test_expect_success 'create files in new directory with dcommit' "
|
|
||||||
echo hello > git-new-dir/world &&
|
|
||||||
git update-index --add git-new-dir/world &&
|
|
||||||
git commit -m hello &&
|
|
||||||
- start_svnserve &&
|
|
||||||
git svn dcommit
|
|
||||||
"
|
|
||||||
|
|
||||||
12
git-1.5-gitweb-home-link.patch
Normal file
12
git-1.5-gitweb-home-link.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up git-1.7.2/gitweb/gitweb.perl.orig git-1.7.2/gitweb/gitweb.perl
|
||||||
|
--- git-1.7.2/gitweb/gitweb.perl.orig 2010-07-21 23:35:25.000000000 +0200
|
||||||
|
+++ git-1.7.2/gitweb/gitweb.perl 2010-07-22 10:49:50.385707086 +0200
|
||||||
|
@@ -79,7 +79,7 @@ our $projectroot = "++GITWEB_PROJECTROOT
|
||||||
|
our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++";
|
||||||
|
|
||||||
|
# string of the home link on top of all pages
|
||||||
|
-our $home_link_str = "++GITWEB_HOME_LINK_STR++";
|
||||||
|
+our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects";
|
||||||
|
|
||||||
|
# name of your site or organization to appear in page titles
|
||||||
|
# replace this with something more descriptive for clearer bookmarks
|
||||||
43
git-1.6-update-contrib-hooks-path.patch
Normal file
43
git-1.6-update-contrib-hooks-path.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
From 1963c852acc5d8c521a3e4f3b9ceb313d26a473c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Todd Zullinger <tmz@pobox.com>
|
||||||
|
Date: Mon, 22 Jun 2009 08:00:29 -0400
|
||||||
|
Subject: [PATCH] Update path to contrib/hooks/post-receive-email
|
||||||
|
|
||||||
|
---
|
||||||
|
contrib/hooks/post-receive-email | 6 +++---
|
||||||
|
templates/hooks--post-receive.sample | 2 +-
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
|
||||||
|
index 2a66063..4835ada 100755
|
||||||
|
--- a/contrib/hooks/post-receive-email
|
||||||
|
+++ b/contrib/hooks/post-receive-email
|
||||||
|
@@ -10,12 +10,12 @@
|
||||||
|
# This hook is stored in the contrib/hooks directory. Your distribution
|
||||||
|
# will have put this somewhere standard. You should make this script
|
||||||
|
# executable then link to it in the repository you would like to use it in.
|
||||||
|
-# For example, on debian the hook is stored in
|
||||||
|
-# /usr/share/doc/git-core/contrib/hooks/post-receive-email:
|
||||||
|
+# For example, on fedora the hook is stored in
|
||||||
|
+# /usr/share/git-core/contrib/hooks/post-receive-email:
|
||||||
|
#
|
||||||
|
# chmod a+x post-receive-email
|
||||||
|
# cd /path/to/your/repository.git
|
||||||
|
-# ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive
|
||||||
|
+# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive
|
||||||
|
#
|
||||||
|
# This hook script assumes it is enabled on the central repository of a
|
||||||
|
# project, with all users pushing only to it and not between each other. It
|
||||||
|
diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample
|
||||||
|
index 18d2e0f..cf57878 100755
|
||||||
|
--- a/templates/hooks--post-receive.sample
|
||||||
|
+++ b/templates/hooks--post-receive.sample
|
||||||
|
@@ -12,4 +12,4 @@
|
||||||
|
# see contrib/hooks/ for a sample, or uncomment the next line and
|
||||||
|
# rename the file to "post-receive".
|
||||||
|
|
||||||
|
-#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
|
||||||
|
+#. /usr/share/git-core/contrib/hooks/post-receive-email
|
||||||
|
--
|
||||||
|
1.6.3.2
|
||||||
|
|
||||||
252
git-1.7-el5-emacs-support.patch
Normal file
252
git-1.7-el5-emacs-support.patch
Normal file
|
|
@ -0,0 +1,252 @@
|
||||||
|
From 424058e0607b4b3c558d19633090e06e7bd2b851 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Todd Zullinger <tmz@pobox.com>
|
||||||
|
Date: Wed, 2 Feb 2011 21:24:44 -0500
|
||||||
|
Subject: [PATCH] Restore vc-git.el for basic compatibility on EL-5
|
||||||
|
|
||||||
|
This is the vc-git.el from 1.6.4.1, the last version to include it.
|
||||||
|
Most uses will be better served by the vc-git.el which is provided by
|
||||||
|
emacs >= 22.2, but on EL-5 we don't have the luxury of a modern emacs.
|
||||||
|
---
|
||||||
|
contrib/emacs/Makefile | 2 +-
|
||||||
|
contrib/emacs/vc-git.el | 216 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 217 insertions(+), 1 deletions(-)
|
||||||
|
create mode 100644 contrib/emacs/vc-git.el
|
||||||
|
|
||||||
|
diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile
|
||||||
|
index 24d9312..a48540a 100644
|
||||||
|
--- a/contrib/emacs/Makefile
|
||||||
|
+++ b/contrib/emacs/Makefile
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
EMACS = emacs
|
||||||
|
|
||||||
|
-ELC = git.elc git-blame.elc
|
||||||
|
+ELC = git.elc vc-git.elc git-blame.elc
|
||||||
|
INSTALL ?= install
|
||||||
|
INSTALL_ELC = $(INSTALL) -m 644
|
||||||
|
prefix ?= $(HOME)
|
||||||
|
diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..b8f6be5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/contrib/emacs/vc-git.el
|
||||||
|
@@ -0,0 +1,216 @@
|
||||||
|
+;;; vc-git.el --- VC backend for the git version control system
|
||||||
|
+
|
||||||
|
+;; Copyright (C) 2006 Alexandre Julliard
|
||||||
|
+
|
||||||
|
+;; This program is free software; you can redistribute it and/or
|
||||||
|
+;; modify it under the terms of the GNU General Public License as
|
||||||
|
+;; published by the Free Software Foundation; either version 2 of
|
||||||
|
+;; the License, or (at your option) any later version.
|
||||||
|
+;;
|
||||||
|
+;; This program is distributed in the hope that it will be
|
||||||
|
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
+;; PURPOSE. See the GNU General Public License for more details.
|
||||||
|
+;;
|
||||||
|
+;; You should have received a copy of the GNU General Public
|
||||||
|
+;; License along with this program; if not, write to the Free
|
||||||
|
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||||
|
+;; MA 02111-1307 USA
|
||||||
|
+
|
||||||
|
+;;; Commentary:
|
||||||
|
+
|
||||||
|
+;; This file contains a VC backend for the git version control
|
||||||
|
+;; system.
|
||||||
|
+;;
|
||||||
|
+;; To install: put this file on the load-path and add GIT to the list
|
||||||
|
+;; of supported backends in `vc-handled-backends'; the following line,
|
||||||
|
+;; placed in your ~/.emacs, will accomplish this:
|
||||||
|
+;;
|
||||||
|
+;; (add-to-list 'vc-handled-backends 'GIT)
|
||||||
|
+;;
|
||||||
|
+;; TODO
|
||||||
|
+;; - changelog generation
|
||||||
|
+;; - working with revisions other than HEAD
|
||||||
|
+;;
|
||||||
|
+
|
||||||
|
+(eval-when-compile (require 'cl))
|
||||||
|
+
|
||||||
|
+(defvar git-commits-coding-system 'utf-8
|
||||||
|
+ "Default coding system for git commits.")
|
||||||
|
+
|
||||||
|
+(defun vc-git--run-command-string (file &rest args)
|
||||||
|
+ "Run a git command on FILE and return its output as string."
|
||||||
|
+ (let* ((ok t)
|
||||||
|
+ (str (with-output-to-string
|
||||||
|
+ (with-current-buffer standard-output
|
||||||
|
+ (unless (eq 0 (apply #'call-process "git" nil '(t nil) nil
|
||||||
|
+ (append args (list (file-relative-name file)))))
|
||||||
|
+ (setq ok nil))))))
|
||||||
|
+ (and ok str)))
|
||||||
|
+
|
||||||
|
+(defun vc-git--run-command (file &rest args)
|
||||||
|
+ "Run a git command on FILE, discarding any output."
|
||||||
|
+ (let ((name (file-relative-name file)))
|
||||||
|
+ (eq 0 (apply #'call-process "git" nil (get-buffer "*Messages") nil (append args (list name))))))
|
||||||
|
+
|
||||||
|
+(defun vc-git-registered (file)
|
||||||
|
+ "Check whether FILE is registered with git."
|
||||||
|
+ (with-temp-buffer
|
||||||
|
+ (let* ((dir (file-name-directory file))
|
||||||
|
+ (name (file-relative-name file dir)))
|
||||||
|
+ (and (ignore-errors
|
||||||
|
+ (when dir (cd dir))
|
||||||
|
+ (eq 0 (call-process "git" nil '(t nil) nil "ls-files" "-c" "-z" "--" name)))
|
||||||
|
+ (let ((str (buffer-string)))
|
||||||
|
+ (and (> (length str) (length name))
|
||||||
|
+ (string= (substring str 0 (1+ (length name))) (concat name "\0"))))))))
|
||||||
|
+
|
||||||
|
+(defun vc-git-state (file)
|
||||||
|
+ "git-specific version of `vc-state'."
|
||||||
|
+ (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
|
||||||
|
+ (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" diff))
|
||||||
|
+ 'edited
|
||||||
|
+ 'up-to-date)))
|
||||||
|
+
|
||||||
|
+(defun vc-git-workfile-version (file)
|
||||||
|
+ "git-specific version of `vc-workfile-version'."
|
||||||
|
+ (let ((str (with-output-to-string
|
||||||
|
+ (with-current-buffer standard-output
|
||||||
|
+ (call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD")))))
|
||||||
|
+ (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
|
||||||
|
+ (match-string 2 str)
|
||||||
|
+ str)))
|
||||||
|
+
|
||||||
|
+(defun vc-git-symbolic-commit (commit)
|
||||||
|
+ "Translate COMMIT string into symbolic form.
|
||||||
|
+Returns nil if not possible."
|
||||||
|
+ (and commit
|
||||||
|
+ (with-temp-buffer
|
||||||
|
+ (and
|
||||||
|
+ (zerop
|
||||||
|
+ (call-process "git" nil '(t nil) nil "name-rev"
|
||||||
|
+ "--name-only" "--tags"
|
||||||
|
+ commit))
|
||||||
|
+ (goto-char (point-min))
|
||||||
|
+ (= (forward-line 2) 1)
|
||||||
|
+ (bolp)
|
||||||
|
+ (buffer-substring-no-properties (point-min) (1- (point-max)))))))
|
||||||
|
+
|
||||||
|
+(defun vc-git-previous-version (file rev)
|
||||||
|
+ "git-specific version of `vc-previous-version'."
|
||||||
|
+ (let ((default-directory (file-name-directory (expand-file-name file)))
|
||||||
|
+ (file (file-name-nondirectory file)))
|
||||||
|
+ (vc-git-symbolic-commit
|
||||||
|
+ (with-temp-buffer
|
||||||
|
+ (and
|
||||||
|
+ (zerop
|
||||||
|
+ (call-process "git" nil '(t nil) nil "rev-list"
|
||||||
|
+ "-2" rev "--" file))
|
||||||
|
+ (goto-char (point-max))
|
||||||
|
+ (bolp)
|
||||||
|
+ (zerop (forward-line -1))
|
||||||
|
+ (not (bobp))
|
||||||
|
+ (buffer-substring-no-properties
|
||||||
|
+ (point)
|
||||||
|
+ (1- (point-max))))))))
|
||||||
|
+
|
||||||
|
+(defun vc-git-next-version (file rev)
|
||||||
|
+ "git-specific version of `vc-next-version'."
|
||||||
|
+ (let* ((default-directory (file-name-directory
|
||||||
|
+ (expand-file-name file)))
|
||||||
|
+ (file (file-name-nondirectory file))
|
||||||
|
+ (current-rev
|
||||||
|
+ (with-temp-buffer
|
||||||
|
+ (and
|
||||||
|
+ (zerop
|
||||||
|
+ (call-process "git" nil '(t nil) nil "rev-list"
|
||||||
|
+ "-1" rev "--" file))
|
||||||
|
+ (goto-char (point-max))
|
||||||
|
+ (bolp)
|
||||||
|
+ (zerop (forward-line -1))
|
||||||
|
+ (bobp)
|
||||||
|
+ (buffer-substring-no-properties
|
||||||
|
+ (point)
|
||||||
|
+ (1- (point-max)))))))
|
||||||
|
+ (and current-rev
|
||||||
|
+ (vc-git-symbolic-commit
|
||||||
|
+ (with-temp-buffer
|
||||||
|
+ (and
|
||||||
|
+ (zerop
|
||||||
|
+ (call-process "git" nil '(t nil) nil "rev-list"
|
||||||
|
+ "HEAD" "--" file))
|
||||||
|
+ (goto-char (point-min))
|
||||||
|
+ (search-forward current-rev nil t)
|
||||||
|
+ (zerop (forward-line -1))
|
||||||
|
+ (buffer-substring-no-properties
|
||||||
|
+ (point)
|
||||||
|
+ (progn (forward-line 1) (1- (point))))))))))
|
||||||
|
+
|
||||||
|
+(defun vc-git-revert (file &optional contents-done)
|
||||||
|
+ "Revert FILE to the version stored in the git repository."
|
||||||
|
+ (if contents-done
|
||||||
|
+ (vc-git--run-command file "update-index" "--")
|
||||||
|
+ (vc-git--run-command file "checkout" "HEAD")))
|
||||||
|
+
|
||||||
|
+(defun vc-git-checkout-model (file)
|
||||||
|
+ 'implicit)
|
||||||
|
+
|
||||||
|
+(defun vc-git-workfile-unchanged-p (file)
|
||||||
|
+ (let ((sha1 (vc-git--run-command-string file "hash-object" "--"))
|
||||||
|
+ (head (vc-git--run-command-string file "ls-tree" "-z" "HEAD" "--")))
|
||||||
|
+ (and head
|
||||||
|
+ (string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head)
|
||||||
|
+ (string= (car (split-string sha1 "\n")) (match-string 1 head)))))
|
||||||
|
+
|
||||||
|
+(defun vc-git-register (file &optional rev comment)
|
||||||
|
+ "Register FILE into the git version-control system."
|
||||||
|
+ (vc-git--run-command file "update-index" "--add" "--"))
|
||||||
|
+
|
||||||
|
+(defun vc-git-print-log (file &optional buffer)
|
||||||
|
+ (let ((name (file-relative-name file))
|
||||||
|
+ (coding-system-for-read git-commits-coding-system))
|
||||||
|
+ (vc-do-command buffer 'async "git" name "rev-list" "--pretty" "HEAD" "--")))
|
||||||
|
+
|
||||||
|
+(defun vc-git-diff (file &optional rev1 rev2 buffer)
|
||||||
|
+ (let ((name (file-relative-name file))
|
||||||
|
+ (buf (or buffer "*vc-diff*")))
|
||||||
|
+ (if (and rev1 rev2)
|
||||||
|
+ (vc-do-command buf 0 "git" name "diff-tree" "-p" rev1 rev2 "--")
|
||||||
|
+ (vc-do-command buf 0 "git" name "diff-index" "-p" (or rev1 "HEAD") "--"))
|
||||||
|
+ ; git-diff-index doesn't set exit status like diff does
|
||||||
|
+ (if (vc-git-workfile-unchanged-p file) 0 1)))
|
||||||
|
+
|
||||||
|
+(defun vc-git-checkin (file rev comment)
|
||||||
|
+ (let ((coding-system-for-write git-commits-coding-system))
|
||||||
|
+ (vc-git--run-command file "commit" "-m" comment "--only" "--")))
|
||||||
|
+
|
||||||
|
+(defun vc-git-checkout (file &optional editable rev destfile)
|
||||||
|
+ (if destfile
|
||||||
|
+ (let ((fullname (substring
|
||||||
|
+ (vc-git--run-command-string file "ls-files" "-z" "--full-name" "--")
|
||||||
|
+ 0 -1))
|
||||||
|
+ (coding-system-for-read 'no-conversion)
|
||||||
|
+ (coding-system-for-write 'no-conversion))
|
||||||
|
+ (with-temp-file destfile
|
||||||
|
+ (eq 0 (call-process "git" nil t nil "cat-file" "blob"
|
||||||
|
+ (concat (or rev "HEAD") ":" fullname)))))
|
||||||
|
+ (vc-git--run-command file "checkout" (or rev "HEAD"))))
|
||||||
|
+
|
||||||
|
+(defun vc-git-annotate-command (file buf &optional rev)
|
||||||
|
+ ; FIXME: rev is ignored
|
||||||
|
+ (let ((name (file-relative-name file)))
|
||||||
|
+ (call-process "git" nil buf nil "blame" name)))
|
||||||
|
+
|
||||||
|
+(defun vc-git-annotate-time ()
|
||||||
|
+ (and (re-search-forward "[0-9a-f]+ (.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+)" nil t)
|
||||||
|
+ (vc-annotate-convert-time
|
||||||
|
+ (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7))))))
|
||||||
|
+
|
||||||
|
+;; Not really useful since we can't do anything with the revision yet
|
||||||
|
+;;(defun vc-annotate-extract-revision-at-line ()
|
||||||
|
+;; (save-excursion
|
||||||
|
+;; (move-beginning-of-line 1)
|
||||||
|
+;; (and (looking-at "[0-9a-f]+")
|
||||||
|
+;; (buffer-substring (match-beginning 0) (match-end 0)))))
|
||||||
|
+
|
||||||
|
+(provide 'vc-git)
|
||||||
|
--
|
||||||
|
1.7.3.4
|
||||||
|
|
||||||
8
git-1.7.6.1.tar.bz2.sign
Normal file
8
git-1.7.6.1.tar.bz2.sign
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||||
|
Comment: See http://www.kernel.org/signature.html for info
|
||||||
|
|
||||||
|
iD8DBQBOVZCyyGugalF9Dw4RAmGsAKCS1gD8soK84X5rSX0/nlcdTde90wCdEG8e
|
||||||
|
P1MrSqSH3yuGkFzFieprZSA=
|
||||||
|
=/XaV
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
|
|
@ -1,275 +0,0 @@
|
||||||
From 65e88e659008e2cbf79cf44975406ff0d569a3a9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= <opohorel@redhat.com>
|
|
||||||
Date: Thu, 20 Nov 2025 12:24:59 +0100
|
|
||||||
Subject: [PATCH] sideband: mask control characters
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The output of `git clone` is a vital component for understanding what
|
|
||||||
has happened when things go wrong. However, these logs are partially
|
|
||||||
under the control of the remote server (via the "sideband", which
|
|
||||||
typically contains what the remote `git pack-objects` process sends to
|
|
||||||
`stderr`), and is currently not sanitized by Git.
|
|
||||||
|
|
||||||
This makes Git susceptible to ANSI escape sequence injection (see
|
|
||||||
CWE-150, https://cwe.mitre.org/data/definitions/150.html), which allows
|
|
||||||
attackers to corrupt terminal state, to hide information, and even to
|
|
||||||
insert characters into the input buffer (i.e. as if the user had typed
|
|
||||||
those characters).
|
|
||||||
|
|
||||||
To plug this vulnerability, disallow any control character in the
|
|
||||||
sideband, replacing them instead with the common `^<letter/symbol>`
|
|
||||||
(e.g. `^[` for `\x1b`, `^A` for `\x01`).
|
|
||||||
|
|
||||||
There is likely a need for more fine-grained controls instead of using a
|
|
||||||
"heavy hammer" like this, which will be introduced subsequently.
|
|
||||||
|
|
||||||
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
||||||
|
|
||||||
sideband: introduce an "escape hatch" to allow control characters
|
|
||||||
|
|
||||||
The preceding commit fixed the vulnerability whereas sideband messages
|
|
||||||
(that are under the control of the remote server) could contain ANSI
|
|
||||||
escape sequences that would be sent to the terminal verbatim.
|
|
||||||
|
|
||||||
However, this fix may not be desirable under all circumstances, e.g.
|
|
||||||
when remote servers deliberately add coloring to their messages to
|
|
||||||
increase their urgency.
|
|
||||||
|
|
||||||
To help with those use cases, give users a way to opt-out of the
|
|
||||||
protections: `sideband.allowControlCharacters`.
|
|
||||||
|
|
||||||
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
||||||
|
|
||||||
sideband: do allow ANSI color sequences by default
|
|
||||||
|
|
||||||
The preceding two commits introduced special handling of the sideband
|
|
||||||
channel to neutralize ANSI escape sequences before sending the payload
|
|
||||||
to the terminal, and `sideband.allowControlCharacters` to override that
|
|
||||||
behavior.
|
|
||||||
|
|
||||||
However, some `pre-receive` hooks that are actively used in practice
|
|
||||||
want to color their messages and therefore rely on the fact that Git
|
|
||||||
passes them through to the terminal.
|
|
||||||
|
|
||||||
In contrast to other ANSI escape sequences, it is highly unlikely that
|
|
||||||
coloring sequences can be essential tools in attack vectors that mislead
|
|
||||||
Git users e.g. by hiding crucial information.
|
|
||||||
|
|
||||||
Therefore we can have both: Continue to allow ANSI coloring sequences to
|
|
||||||
be passed to the terminal, and neutralize all other ANSI escape
|
|
||||||
sequences.
|
|
||||||
|
|
||||||
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
||||||
|
|
||||||
sideband: default to allowControlCharacters=true
|
|
||||||
|
|
||||||
We don't want to change the default Git behaviour, just add the option
|
|
||||||
to filter control characters.
|
|
||||||
|
|
||||||
Signed-off-by: Ondřej Pohořelský <opohorel@redhat.com>
|
|
||||||
---
|
|
||||||
Documentation/config.adoc | 2 +
|
|
||||||
Documentation/config/sideband.adoc | 16 ++++++
|
|
||||||
sideband.c | 78 ++++++++++++++++++++++++++++-
|
|
||||||
t/t5409-colorize-remote-messages.sh | 31 ++++++++++++
|
|
||||||
4 files changed, 125 insertions(+), 2 deletions(-)
|
|
||||||
create mode 100644 Documentation/config/sideband.adoc
|
|
||||||
|
|
||||||
diff --git a/Documentation/config.adoc b/Documentation/config.adoc
|
|
||||||
index 62eebe7c54..dcea3c0c15 100644
|
|
||||||
--- a/Documentation/config.adoc
|
|
||||||
+++ b/Documentation/config.adoc
|
|
||||||
@@ -523,6 +523,8 @@ include::config/sequencer.adoc[]
|
|
||||||
|
|
||||||
include::config/showbranch.adoc[]
|
|
||||||
|
|
||||||
+include::config/sideband.adoc[]
|
|
||||||
+
|
|
||||||
include::config/sparse.adoc[]
|
|
||||||
|
|
||||||
include::config/splitindex.adoc[]
|
|
||||||
diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..c9ba24a02c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Documentation/config/sideband.adoc
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+sideband.allowControlCharacters::
|
|
||||||
+ By default, control characters that are delivered via the sideband
|
|
||||||
+ are NOT masked. Use this config setting to prevent potentially
|
|
||||||
+ unwanted ANSI escape sequences from being sent to the terminal:
|
|
||||||
++
|
|
||||||
+--
|
|
||||||
+ color::
|
|
||||||
+ Allow ANSI color sequences, line feeds and horizontal tabs,
|
|
||||||
+ but mask all other control characters.
|
|
||||||
+ false::
|
|
||||||
+ Mask all control characters other than line feeds and
|
|
||||||
+ horizontal tabs.
|
|
||||||
+ true::
|
|
||||||
+ Allow all control characters to be sent to the terminal.
|
|
||||||
+ This is the default.
|
|
||||||
+--
|
|
||||||
\ No newline at end of file
|
|
||||||
diff --git a/sideband.c b/sideband.c
|
|
||||||
index ea7c25211e..88d1b44a7a 100644
|
|
||||||
--- a/sideband.c
|
|
||||||
+++ b/sideband.c
|
|
||||||
@@ -26,6 +26,12 @@ static struct keyword_entry keywords[] = {
|
|
||||||
{ "error", GIT_COLOR_BOLD_RED },
|
|
||||||
};
|
|
||||||
|
|
||||||
+static enum {
|
|
||||||
+ ALLOW_NO_CONTROL_CHARACTERS = 0,
|
|
||||||
+ ALLOW_ALL_CONTROL_CHARACTERS = 1,
|
|
||||||
+ ALLOW_ANSI_COLOR_SEQUENCES = 2
|
|
||||||
+} allow_control_characters = ALLOW_ALL_CONTROL_CHARACTERS;
|
|
||||||
+
|
|
||||||
/* Returns a color setting (GIT_COLOR_NEVER, etc). */
|
|
||||||
static enum git_colorbool use_sideband_colors(void)
|
|
||||||
{
|
|
||||||
@@ -39,6 +45,25 @@ static enum git_colorbool use_sideband_colors(void)
|
|
||||||
if (use_sideband_colors_cached != GIT_COLOR_UNKNOWN)
|
|
||||||
return use_sideband_colors_cached;
|
|
||||||
|
|
||||||
+ switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) {
|
|
||||||
+ case 0: /* Boolean value */
|
|
||||||
+ allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS :
|
|
||||||
+ ALLOW_NO_CONTROL_CHARACTERS;
|
|
||||||
+ break;
|
|
||||||
+ case -1: /* non-Boolean value */
|
|
||||||
+ if (repo_config_get_string_tmp(the_repository, "sideband.allowcontrolcharacters",
|
|
||||||
+ &value))
|
|
||||||
+ ; /* huh? `get_maybe_bool()` returned -1 */
|
|
||||||
+ else if (!strcmp(value, "color"))
|
|
||||||
+ allow_control_characters = ALLOW_ANSI_COLOR_SEQUENCES;
|
|
||||||
+ else
|
|
||||||
+ warning(_("unrecognized value for `sideband."
|
|
||||||
+ "allowControlCharacters`: '%s'"), value);
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ break; /* not configured */
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!repo_config_get_string_tmp(the_repository, key, &value))
|
|
||||||
use_sideband_colors_cached = git_config_colorbool(key, value);
|
|
||||||
else if (!repo_config_get_string_tmp(the_repository, "color.ui", &value))
|
|
||||||
@@ -66,6 +91,55 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref
|
|
||||||
list_config_item(list, prefix, keywords[i].keyword);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int handle_ansi_color_sequence(struct strbuf *dest, const char *src, int n)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Valid ANSI color sequences are of the form
|
|
||||||
+ *
|
|
||||||
+ * ESC [ [<n> [; <n>]*] m
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ if (allow_control_characters != ALLOW_ANSI_COLOR_SEQUENCES ||
|
|
||||||
+ n < 3 || src[0] != '\x1b' || src[1] != '[')
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ for (i = 2; i < n; i++) {
|
|
||||||
+ if (src[i] == 'm') {
|
|
||||||
+ strbuf_add(dest, src, i + 1);
|
|
||||||
+ return i;
|
|
||||||
+ }
|
|
||||||
+ if (!isdigit(src[i]) && src[i] != ';')
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ if (allow_control_characters == ALLOW_ALL_CONTROL_CHARACTERS) {
|
|
||||||
+ strbuf_add(dest, src, n);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ strbuf_grow(dest, n);
|
|
||||||
+ for (; n && *src; src++, n--) {
|
|
||||||
+ if (!iscntrl(*src) || *src == '\t' || *src == '\n')
|
|
||||||
+ strbuf_addch(dest, *src);
|
|
||||||
+ else if ((i = handle_ansi_color_sequence(dest, src, n))) {
|
|
||||||
+ src += i;
|
|
||||||
+ n -= i;
|
|
||||||
+ } else {
|
|
||||||
+ strbuf_addch(dest, '^');
|
|
||||||
+ strbuf_addch(dest, 0x40 + *src);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Optionally highlight one keyword in remote output if it appears at the start
|
|
||||||
* of the line. This should be called for a single line only, which is
|
|
||||||
@@ -81,7 +155,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n)
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (!want_color_stderr(use_sideband_colors())) {
|
|
||||||
- strbuf_add(dest, src, n);
|
|
||||||
+ strbuf_add_sanitized(dest, src, n);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -114,7 +188,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- strbuf_add(dest, src, n);
|
|
||||||
+ strbuf_add_sanitized(dest, src, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh
|
|
||||||
index fa5de4500a..2d40d8c640 100755
|
|
||||||
--- a/t/t5409-colorize-remote-messages.sh
|
|
||||||
+++ b/t/t5409-colorize-remote-messages.sh
|
|
||||||
@@ -98,4 +98,35 @@ test_expect_success 'fallback to color.ui' '
|
|
||||||
grep "<BOLD;RED>error<RESET>: error" decoded
|
|
||||||
'
|
|
||||||
|
|
||||||
+test_expect_success 'disallow (color) control sequences in sideband' '
|
|
||||||
+ write_script .git/color-me-surprised <<-\EOF &&
|
|
||||||
+ printf "error: Have you \\033[31mread\\033[m this?\\a\\n" >&2
|
|
||||||
+ exec "$@"
|
|
||||||
+ EOF
|
|
||||||
+ test_config_global uploadPack.packObjectshook ./color-me-surprised &&
|
|
||||||
+ test_commit need-at-least-one-commit &&
|
|
||||||
+
|
|
||||||
+ git -c sideband.allowControlCharacters=color \
|
|
||||||
+ clone --no-local . throw-away 2>stderr &&
|
|
||||||
+ test_decode_color <stderr >decoded &&
|
|
||||||
+ test_grep RED decoded &&
|
|
||||||
+ test_grep "\\^G" stderr &&
|
|
||||||
+ tr -dc "\\007" <stderr >actual &&
|
|
||||||
+ test_must_be_empty actual &&
|
|
||||||
+
|
|
||||||
+ rm -rf throw-away &&
|
|
||||||
+ git -c sideband.allowControlCharacters=false \
|
|
||||||
+ clone --no-local . throw-away 2>stderr &&
|
|
||||||
+ test_decode_color <stderr >decoded &&
|
|
||||||
+ test_grep ! RED decoded &&
|
|
||||||
+ test_grep "\\^G" stderr &&
|
|
||||||
+
|
|
||||||
+ rm -rf throw-away &&
|
|
||||||
+ git -c sideband.allowControlCharacters clone --no-local . throw-away 2>stderr &&
|
|
||||||
+ test_decode_color <stderr >decoded &&
|
|
||||||
+ test_grep RED decoded &&
|
|
||||||
+ tr -dc "\\007" <stderr >actual &&
|
|
||||||
+ test_file_not_empty actual
|
|
||||||
+'
|
|
||||||
+
|
|
||||||
test_done
|
|
||||||
--
|
|
||||||
2.51.1
|
|
||||||
|
|
||||||
5
git-init.el
Normal file
5
git-init.el
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
;; Git VC backend
|
||||||
|
(add-to-list 'vc-handled-backends 'GIT t)
|
||||||
|
(autoload 'git-status "git" "GIT mode." t)
|
||||||
|
(autoload 'git-blame-mode "git-blame"
|
||||||
|
"Minor mode for incremental blame for Git." t)
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
diff -ur b/t/lib-httpd/apache.conf a/t/lib-httpd/apache.conf
|
|
||||||
--- b/t/lib-httpd/apache.conf 2024-01-09 11:06:46.660868023 +0100
|
|
||||||
+++ a/t/lib-httpd/apache.conf 2024-01-09 11:09:09.572713625 +0100
|
|
||||||
@@ -272,7 +272,9 @@
|
|
||||||
<IfDefine DAV>
|
|
||||||
LoadModule dav_module modules/mod_dav.so
|
|
||||||
LoadModule dav_fs_module modules/mod_dav_fs.so
|
|
||||||
-
|
|
||||||
+ <IfDirective DavLockDBType>
|
|
||||||
+ DavLockDBType sdbm
|
|
||||||
+ </IfDirective>
|
|
||||||
DAVLockDB DAVLock
|
|
||||||
<Location /dumb/>
|
|
||||||
Dav on
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
# the dictionary is a bit limited
|
|
||||||
addFilter("git.* spelling-error %description .* subpackages")
|
|
||||||
addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject|subtree)")
|
|
||||||
|
|
||||||
# git-core-doc requires git-core, which provides the symlink target
|
|
||||||
addFilter("git(-core-doc)?\..*: W: dangling-relative-symlink /usr/share/doc/git/contrib/hooks ../../../git-core/contrib/hooks")
|
|
||||||
|
|
||||||
# gitk requires git, which provides the symlink target
|
|
||||||
addFilter("gitk\.noarch: W: dangling-relative-symlink /usr/share/bash-completion/completions/gitk git")
|
|
||||||
|
|
||||||
# git-gui requires git, which provides the git binary
|
|
||||||
addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications/git-gui.desktop git")
|
|
||||||
|
|
||||||
# ignore no binary warning for main git package; making it noarch isn't trivial
|
|
||||||
# since we have arch-specific subpackages
|
|
||||||
addFilter("git\..*: E: no-binary$")
|
|
||||||
|
|
||||||
# ignore no doc/manpage warnings where we don't expect any documentation
|
|
||||||
addFilter("git-(all|core|credential-libsecret)\..*: W: no-documentation")
|
|
||||||
addFilter("perl-Git-SVN.noarch: W: no-documentation")
|
|
||||||
addFilter("git-core\..*: W: no-manual-page-for-binary")
|
|
||||||
|
|
||||||
# nothing provides git-gnome-keyring, it's simply obsolete
|
|
||||||
# similarly ignore the warning when git-cvs and git-p4 are disabled
|
|
||||||
addFilter("git.* obsolete-not-provided git-(cvs|gnome-keyring|p4)")
|
|
||||||
|
|
||||||
# git-svn has both man and html docs and only a single command
|
|
||||||
addFilter('git-svn\..*: W: package-with-huge-docs')
|
|
||||||
|
|
||||||
# ignore potential "bashisms" in docs
|
|
||||||
addFilter('git-core-doc\.noarch: W: potential-bashisms /usr/share/doc/git/')
|
|
||||||
|
|
||||||
# ignore unused-direct-shlib-dependency for libpcre; while it probably could be
|
|
||||||
# removed from some binaries, the cost of doing so isn't worth the gain.
|
|
||||||
addFilter('git-(core|daemon)\..*: W: unused-direct-shlib-dependency .* /lib64/libpcre2-.*')
|
|
||||||
|
|
||||||
# ignore duplicate gvimdiff/nvimdiff files; they are only 29 bytes, sourcing the same base
|
|
||||||
# vimdiff mergetool
|
|
||||||
addFilter('git-core\..*: W: files-duplicate /usr/libexec/git-core/mergetools/[gn]vimdiff')
|
|
||||||
|
|
||||||
# ignore non-standard-dir-in-var for gitweb (#479613)
|
|
||||||
addFilter('gitweb.noarch: W: non-standard-dir-in-var www')
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
^ok 1 # SKIP enable client-side http/2 \(missing HTTP2\)$
|
|
||||||
expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true
|
|
||||||
filesystem does not corrupt utf-8
|
|
||||||
fsmonitor--daemon is not supported on this platform
|
|
||||||
GIT_SKIP_TESTS
|
|
||||||
missing AUTOIDENT
|
|
||||||
missing BUILTIN_TXT_
|
|
||||||
missing CASE_INSENSITIVE_FS
|
|
||||||
missing DONTHAVEIT
|
|
||||||
missing ([!]LONG_IS_64BIT,)?EXPENSIVE
|
|
||||||
missing FSMONITOR_DAEMON
|
|
||||||
missing JGIT
|
|
||||||
missing !?LAZY_(TRUE|FALSE)
|
|
||||||
missing MINGW
|
|
||||||
missing NATIVE_CRLF
|
|
||||||
missing !PCRE
|
|
||||||
missing !PTHREADS
|
|
||||||
missing !REFFILES
|
|
||||||
missing RFC1991
|
|
||||||
missing RUNTIME_PREFIX
|
|
||||||
missing SYMLINKS_WINDOWS
|
|
||||||
missing TAR_NEEDS_PAX_FALLBACK
|
|
||||||
missing UTF8_NFD_TO_NFC
|
|
||||||
missing WINDOWS
|
|
||||||
skipped: skip all tests in t5559
|
|
||||||
skipping case insensitive tests
|
|
||||||
skipping git p4 tests
|
|
||||||
skipping remote-svn tests, python not available
|
|
||||||
skipping svn-info test
|
|
||||||
skipping Windows-(only path|specific) tests
|
|
||||||
Test requiring writable / skipped
|
|
||||||
used to test external credential helpers
|
|
||||||
You must set env var GIT_TEST_ALLOW_SUDO=YES in order to run this test
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=Git Activation Socket
|
|
||||||
|
|
||||||
[Socket]
|
|
||||||
ListenStream=9418
|
|
||||||
Accept=true
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=sockets.target
|
|
||||||
|
|
@ -8,7 +8,7 @@ service git
|
||||||
socket_type = stream
|
socket_type = stream
|
||||||
wait = no
|
wait = no
|
||||||
user = nobody
|
user = nobody
|
||||||
server = @GITEXECDIR@/git-daemon
|
server = @GITCOREDIR@/git-daemon
|
||||||
server_args = --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose
|
server_args = --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose
|
||||||
log_on_failure += USERID
|
log_on_failure += USERID
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=Git Repositories Server Daemon
|
|
||||||
Documentation=man:git-daemon(1)
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
User=nobody
|
|
||||||
ExecStart=-@GITEXECDIR@/git-daemon --base-path=@BASE_PATH@ --export-all \
|
|
||||||
--user-path=public_git --inetd --log-destination=stderr --verbose
|
|
||||||
StandardInput=socket
|
|
||||||
StandardError=journal
|
|
||||||
144
gpgkey-junio.asc
144
gpgkey-junio.asc
|
|
@ -1,144 +0,0 @@
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
|
|
||||||
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
|
|
||||||
=7hTI
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
shopt -s failglob
|
|
||||||
|
|
||||||
# Print output from failing tests
|
|
||||||
printf -v sep "%0.s-" {1..80}
|
|
||||||
for exit_file in t/test-results/*.exit; do
|
|
||||||
[ "$(< "$exit_file")" -eq 0 ] && continue
|
|
||||||
out_file="${exit_file%exit}out"
|
|
||||||
printf '\n%s\n%s\n%s\n' "$sep" "$out_file" "$sep"
|
|
||||||
cat "$out_file"
|
|
||||||
done
|
|
||||||
|
|
||||||
# tar up test-results & $testdir, then print base64 encoded output
|
|
||||||
#
|
|
||||||
# copy $testdir contents to test-results to avoid absolute paths with tar
|
|
||||||
cp -a $testdir/* t/test-results/
|
|
||||||
begin='-----BEGIN BASE64 MESSAGE-----'
|
|
||||||
end='-----END BASE64 MESSAGE-----'
|
|
||||||
printf '\n%s\n' 'test-results and trash directory output follows; decode via:'
|
|
||||||
printf '%s\n' "sed -n '/^${begin}$/,/^${end}$/{/^${begin}$/!{/^${end}$/!p}}' build.log | base64 -d >output.tar.zst"
|
|
||||||
printf '%s\n' "$begin"
|
|
||||||
tar -C t -cf - test-results/ | zstdmt -17 | base64
|
|
||||||
printf '%s\n' "$end"
|
|
||||||
|
|
||||||
exit 1
|
|
||||||
3
sources
3
sources
|
|
@ -1,2 +1 @@
|
||||||
SHA512 (git-2.52.0.tar.xz) = 965e5ebb72d1f080d64e34bdb75f0bb1689c9dd41dcf63b020d986bad49808ac09bfb1115962bc0c5b95bac8622367ac4cd09aa89266f73d2137fe94c90dd3ed
|
34da06b97311a2d3df537e137ed8dd05 git-1.7.6.5.tar.gz
|
||||||
SHA512 (git-2.52.0.tar.sign) = a5a68ce131a5763650c477ec01a4de958dd6a946bdea0f613e26bdab41d2df6b3ca63f9028bbe603bf0c834bd415c86e6c616b1ff08cc48aa7c3c61a37b24b74
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue