* [PATCH 02/13] Enable builds for z/OS.
From: Haritha D via GitGitGadget @ 2023-11-13 10:24 UTC (permalink / raw)
To: git; +Cc: Haritha, Haritha D
In-Reply-To: <pull.1537.git.git.1699871056.gitgitgadget@gmail.com>
From: Haritha D <harithamma.d@ibm.com>
This commit enables git to build on z/OS.
It takes advantage of enahanced ASCII
services on z/OS to auto-convert input
files to ASCII
It also adds support for
[platform]-working-tree-encoding.
Platform is substituted with uname_info.sysname,
so it will only apply to the given platform.
Also adds support for scripts that are not in
standard locations so that /bin/env bash
can be specified.
Signed-off-by: Harithamma D <harithamma.d@ibm.com>
---
Makefile | 21 +++++++++---
builtin.h | 3 ++
builtin/archive.c | 6 ++++
builtin/hash-object.c | 28 +++++++++++++++
combine-diff.c | 4 +++
config.c | 7 ++++
configure.ac | 3 ++
convert.c | 44 ++++++++++++++++++++----
copy.c | 3 ++
diff.c | 11 ++++++
entry.c | 26 ++++++++++++++
environment.c | 3 ++
git-compat-util.h | 8 +++++
negotiator/default.c | 4 +--
negotiator/noop.c | 4 +--
negotiator/skipping.c | 4 +--
object-file.c | 80 ++++++++++++++++++++++++++++++++++++++++++-
read-cache.c | 3 ++
utf8.c | 11 ++++++
19 files changed, 255 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 9c6a2f125f8..30aa76da4f4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,8 @@ include shared.mak
#
# Define SHELL_PATH to a POSIX shell if your /bin/sh is broken.
#
+# Define SHELL_PATH_FOR_SCRIPTS to a POSIX shell if your /bin/sh is broken.
+#
# Define SANE_TOOL_PATH to a colon-separated list of paths to prepend
# to PATH if your tools in /usr/bin are broken.
#
@@ -215,6 +217,8 @@ include shared.mak
#
# Define PERL_PATH to the path of your Perl binary (usually /usr/bin/perl).
#
+# Define PERL_PATH_FOR_SCRIPTS to a Perl binary if your /usr/bin/perl is broken.
+#
# Define NO_PERL if you do not want Perl scripts or libraries at all.
#
# Define NO_PERL_CPAN_FALLBACKS if you do not want to install bundled
@@ -903,9 +907,15 @@ BINDIR_PROGRAMS_NO_X += git-cvsserver
ifndef SHELL_PATH
SHELL_PATH = /bin/sh
endif
+ifndef SHELL_PATH_FOR_SCRIPTS
+ SHELL_PATH_FOR_SCRIPTS = /bin/sh
+endif
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
+ifndef PERL_PATH_FOR_SCRIPTS
+ PERL_PATH_FOR_SCRIPTS = /usr/bin/perl
+endif
ifndef PYTHON_PATH
PYTHON_PATH = /usr/bin/python
endif
@@ -1336,7 +1346,7 @@ THIRD_PARTY_SOURCES += sha1dc/%
# xdiff and reftable libs may in turn depend on what is in libgit.a
GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
-EXTLIBS =
+EXTLIBS = $(ZOPEN_EXTRA_LIBS)
GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -2226,9 +2236,10 @@ perllibdir_relative_SQ = $(subst ','\'',$(perllibdir_relative))
gitwebdir_SQ = $(subst ','\'',$(gitwebdir))
gitwebstaticdir_SQ = $(subst ','\'',$(gitwebstaticdir))
-SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH_FOR_SCRIPTS))
TEST_SHELL_PATH_SQ = $(subst ','\'',$(TEST_SHELL_PATH))
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
+PERL_PATH_FOR_SCRIPTS_SQ = $(subst ','\'',$(PERL_PATH_FOR_SCRIPTS))
PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
DIFF_SQ = $(subst ','\'',$(DIFF))
@@ -2448,7 +2459,7 @@ hook-list.h: generate-hooklist.sh Documentation/githooks.txt
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
$(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
- $(gitwebdir_SQ):$(PERL_PATH_SQ):$(PAGER_ENV):\
+ $(gitwebdir_SQ):$(PERL_PATH_FOR_SCRIPTS_SQ):$(PAGER_ENV):\
$(perllibdir_SQ)
GIT-SCRIPT-DEFINES: FORCE
@FLAGS='$(SCRIPT_DEFINES)'; \
@@ -2465,7 +2476,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
-e $(BROKEN_PATH_FIX) \
-e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
- -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
+ -e 's|@@PERL@@|$(PERL_PATH_FOR_SCRIPTS_SQ)|g' \
-e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
$@.sh >$@+
endef
@@ -2519,7 +2530,7 @@ PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
$(QUIET_GEN) \
sed -e '1{' \
- -e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+ -e ' s|#!.*perl|#!$(PERL_PATH_FOR_SCRIPTS_SQ)|' \
-e ' r GIT-PERL-HEADER' \
-e ' G' \
-e '}' \
diff --git a/builtin.h b/builtin.h
index d560baa6618..806af1a262d 100644
--- a/builtin.h
+++ b/builtin.h
@@ -250,5 +250,8 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix);
int cmd_show_ref(int argc, const char **argv, const char *prefix);
int cmd_pack_refs(int argc, const char **argv, const char *prefix);
int cmd_replace(int argc, const char **argv, const char *prefix);
+#ifdef __MVS__
+ extern int setbinaryfd(int);
+#endif
#endif
diff --git a/builtin/archive.c b/builtin/archive.c
index 90761fdfee0..53ec794356f 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -14,6 +14,12 @@
static void create_output_file(const char *output_file)
{
int output_fd = xopen(output_file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
+#ifdef __MVS__
+ #if (__CHARSET_LIB == 1)
+ if (setbinaryfd(output_fd))
+ die_errno(_("could not tag archive file '%s'"), output_file);
+ #endif
+#endif
if (output_fd != 1) {
if (dup2(output_fd, 1) < 0)
die_errno(_("could not redirect output"));
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 5ffec99dcea..b33b32ff977 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -57,11 +57,39 @@ static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
maybe_flush_or_die(stdout, "hash to stdout");
}
+#ifdef __MVS__
+# if (__CHARSET_LIB == 1)
+# include <stdio.h>
+# include <stdlib.h>
+
+ int setbinaryfd(int fd)
+ {
+ attrib_t attr;
+ int rc;
+
+ memset(&attr, 0, sizeof(attr));
+ attr.att_filetagchg = 1;
+ attr.att_filetag.ft_ccsid = FT_BINARY;
+ attr.att_filetag.ft_txtflag = 0;
+
+ rc = __fchattr(fd, &attr, sizeof(attr));
+ return rc;
+ }
+# endif
+#endif
+
+
static void hash_object(const char *path, const char *type, const char *vpath,
unsigned flags, int literally)
{
int fd;
fd = xopen(path, O_RDONLY);
+#ifdef __MVS__
+# if (__CHARSET_LIB == 1)
+ if (setbinaryfd(fd))
+ die_errno("Cannot set to binary '%s'", path);
+# endif
+#endif
hash_fd(fd, type, vpath, flags, literally);
}
diff --git a/combine-diff.c b/combine-diff.c
index f90f4424829..73445a517c7 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1082,6 +1082,10 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
ssize_t done;
int is_file, i;
+#ifdef __MVS__
+ __disableautocvt(fd);
+#endif
+
elem->mode = canon_mode(st.st_mode);
/* if symlinks don't work, assume symlink if all parents
* are symlinks
diff --git a/config.c b/config.c
index f9a1cca4e8a..37c124a37c0 100644
--- a/config.c
+++ b/config.c
@@ -1521,6 +1521,13 @@ static int git_default_core_config(const char *var, const char *value,
return 0;
}
+ #ifdef __MVS__
+ if (!strcmp(var, "core.ignorefiletags")) {
+ ignore_file_tags = git_config_bool(var, value);
+ return 0;
+ }
+ #endif
+
if (!strcmp(var, "core.safecrlf")) {
int eol_rndtrp_die;
if (value && !strcasecmp(value, "warn")) {
diff --git a/configure.ac b/configure.ac
index 276593cd9dd..ed380504be6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,6 +463,9 @@ else
CC_LD_DYNPATH=-Wl,+b,
else
CC_LD_DYNPATH=
+ if test "$(uname -s)" = "OS/390"; then
+ CC_LD_DYNPATH=-L
+ fi
AC_MSG_WARN([linker does not support runtime path to dynamic libraries])
fi
fi
diff --git a/convert.c b/convert.c
index a8870baff36..4f14ff6f1ed 100644
--- a/convert.c
+++ b/convert.c
@@ -377,12 +377,15 @@ static int check_roundtrip(const char *enc_name)
static const char *default_encoding = "UTF-8";
static int encode_to_git(const char *path, const char *src, size_t src_len,
- struct strbuf *buf, const char *enc, int conv_flags)
+ struct strbuf *buf, const char *enc, enum convert_crlf_action attr_action, int conv_flags)
{
char *dst;
size_t dst_len;
int die_on_error = conv_flags & CONV_WRITE_OBJECT;
+ if (attr_action == CRLF_BINARY) {
+ return 0;
+ }
/*
* No encoding is specified or there is nothing to encode.
* Tell the caller that the content was not modified.
@@ -403,6 +406,11 @@ static int encode_to_git(const char *path, const char *src, size_t src_len,
return 0;
trace_encoding("source", path, enc, src, src_len);
+#ifdef __MVS__
+ // Don't convert ISO8859-1 on z/OS
+ if (strcasecmp("ISO8859-1", enc) == 0)
+ return 0;
+#endif
dst = reencode_string_len(src, src_len, default_encoding, enc,
&dst_len);
if (!dst) {
@@ -468,11 +476,14 @@ static int encode_to_git(const char *path, const char *src, size_t src_len,
}
static int encode_to_worktree(const char *path, const char *src, size_t src_len,
- struct strbuf *buf, const char *enc)
+ struct strbuf *buf, enum convert_crlf_action attr_action, const char *enc)
{
char *dst;
size_t dst_len;
+ if (attr_action == CRLF_BINARY) {
+ return 0;
+ }
/*
* No encoding is specified or there is nothing to encode.
* Tell the caller that the content was not modified.
@@ -1302,18 +1313,37 @@ static int git_path_check_ident(struct attr_check_item *check)
static struct attr_check *check;
+static const char* get_platform() {
+ struct utsname uname_info;
+
+ if (uname(&uname_info))
+ die(_("uname() failed with error '%s' (%d)\n"),
+ strerror(errno),
+ errno);
+
+ if (!strcmp(uname_info.sysname, "OS/390"))
+ return "zos";
+ return uname_info.sysname;
+}
+
+
void convert_attrs(struct index_state *istate,
struct conv_attrs *ca, const char *path)
{
struct attr_check_item *ccheck = NULL;
+ struct strbuf platform_working_tree_encoding = STRBUF_INIT;
+
+ strbuf_addf(&platform_working_tree_encoding, "%s-working-tree-encoding", get_platform());
+
if (!check) {
check = attr_check_initl("crlf", "ident", "filter",
- "eol", "text", "working-tree-encoding",
+ "eol", "text", "working-tree-encoding", platform_working_tree_encoding.buf,
NULL);
user_convert_tail = &user_convert;
git_config(read_convert_config, NULL);
}
+ strbuf_release(&platform_working_tree_encoding);
git_check_attr(istate, path, check);
ccheck = check->items;
@@ -1334,6 +1364,8 @@ void convert_attrs(struct index_state *istate,
ca->crlf_action = CRLF_TEXT_CRLF;
}
ca->working_tree_encoding = git_path_check_encoding(ccheck + 5);
+ if (git_path_check_encoding(ccheck + 6))
+ ca->working_tree_encoding = git_path_check_encoding(ccheck + 6);
/* Save attr and make a decision for action */
ca->attr_action = ca->crlf_action;
@@ -1427,7 +1459,7 @@ int convert_to_git(struct index_state *istate,
len = dst->len;
}
- ret |= encode_to_git(path, src, len, dst, ca.working_tree_encoding, conv_flags);
+ ret |= encode_to_git(path, src, len, dst, ca.working_tree_encoding, ca.attr_action, conv_flags);
if (ret && dst) {
src = dst->buf;
len = dst->len;
@@ -1455,7 +1487,7 @@ void convert_to_git_filter_fd(struct index_state *istate,
if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL, NULL))
die(_("%s: clean filter '%s' failed"), path, ca.drv->name);
- encode_to_git(path, dst->buf, dst->len, dst, ca.working_tree_encoding, conv_flags);
+ encode_to_git(path, dst->buf, dst->len, dst, ca.working_tree_encoding, ca.attr_action, conv_flags);
crlf_to_git(istate, path, dst->buf, dst->len, dst, ca.crlf_action, conv_flags);
ident_to_git(dst->buf, dst->len, dst, ca.ident);
}
@@ -1487,7 +1519,7 @@ static int convert_to_working_tree_ca_internal(const struct conv_attrs *ca,
}
}
- ret |= encode_to_worktree(path, src, len, dst, ca->working_tree_encoding);
+ ret |= encode_to_worktree(path, src, len, dst, ca->attr_action, ca->working_tree_encoding);
if (ret) {
src = dst->buf;
len = dst->len;
diff --git a/copy.c b/copy.c
index 23d84c6c1db..63546aecf81 100644
--- a/copy.c
+++ b/copy.c
@@ -14,6 +14,9 @@ int copy_fd(int ifd, int ofd)
if (write_in_full(ofd, buffer, len) < 0)
return COPY_WRITE_ERROR;
}
+#ifdef __MVS__
+ __copyfdccsid(ifd, ofd);
+#endif
return 0;
}
diff --git a/diff.c b/diff.c
index 2c602df10a3..28b96d53dbc 100644
--- a/diff.c
+++ b/diff.c
@@ -4083,6 +4083,9 @@ int diff_populate_filespec(struct repository *r,
int check_binary = options ? options->check_binary : 0;
int err = 0;
int conv_flags = global_conv_flags_eol;
+#ifdef __MVS__
+ int autocvtToASCII;
+#endif
/*
* demote FAIL to WARN to allow inspecting the situation
* instead of refusing.
@@ -4155,9 +4158,17 @@ int diff_populate_filespec(struct repository *r,
s->is_binary = 1;
return 0;
}
+#ifdef __MVS__
+ validate_codeset(r->index, s->path, &autocvtToASCII);
+#endif
fd = open(s->path, O_RDONLY);
if (fd < 0)
goto err_empty;
+
+#ifdef __MVS__
+ if (!autocvtToASCII)
+ __disableautocvt(fd);
+#endif
s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
close(fd);
s->should_munmap = 1;
diff --git a/entry.c b/entry.c
index 076e97eb89c..df6feb2234b 100644
--- a/entry.c
+++ b/entry.c
@@ -126,6 +126,24 @@ int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st)
return 0;
}
+#ifdef __MVS__
+void tag_file_as_working_tree_encoding(struct index_state *istate, char* path, int fd) {
+ struct conv_attrs ca;
+ convert_attrs(istate, &ca, path);
+ if (ca.attr_action != CRLF_BINARY) {
+ if (ca.working_tree_encoding)
+ __chgfdcodeset(fd, ca.working_tree_encoding);
+ else
+ __setfdtext(fd);
+ }
+ else {
+ __setfdbinary(fd);
+ }
+
+ __disableautocvt(fd);
+}
+#endif
+
static int streaming_write_entry(const struct cache_entry *ce, char *path,
struct stream_filter *filter,
const struct checkout *state, int to_tempfile,
@@ -138,6 +156,10 @@ static int streaming_write_entry(const struct cache_entry *ce, char *path,
if (fd < 0)
return -1;
+#ifdef __MVS__
+ tag_file_as_working_tree_encoding(state->istate, path, fd);
+#endif
+
result |= stream_blob_to_fd(fd, &ce->oid, filter, 1);
*fstat_done = fstat_checkout_output(fd, state, statbuf);
result |= close(fd);
@@ -374,6 +396,10 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
return error_errno("unable to create file %s", path);
}
+#ifdef __MVS__
+ tag_file_as_working_tree_encoding(state->istate, path, fd);
+#endif
+
wrote = write_in_full(fd, new_blob, size);
if (!to_tempfile)
fstat_done = fstat_checkout_output(fd, state, &st);
diff --git a/environment.c b/environment.c
index bb3c2a96a33..2e4d3a1e058 100644
--- a/environment.c
+++ b/environment.c
@@ -51,6 +51,9 @@ const char *git_hooks_path;
int zlib_compression_level = Z_BEST_SPEED;
int pack_compression_level = Z_DEFAULT_COMPRESSION;
int fsync_object_files = -1;
+#ifdef __MVS__
+int ignore_file_tags = 0;
+#endif
int use_fsync = -1;
enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT;
enum fsync_component fsync_components = FSYNC_COMPONENTS_DEFAULT;
diff --git a/git-compat-util.h b/git-compat-util.h
index 3e7a59b5ff1..66e0abec24b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -223,7 +223,15 @@ struct strbuf;
#include <sys/stat.h>
#include <fcntl.h>
#include <stddef.h>
+#ifdef __MVS__
+#define release stdlib_release
+#define fetch stdlib_fetch
+#endif
#include <stdlib.h>
+#ifdef __MVS__
+#undef fetch
+#undef release
+#endif
#include <stdarg.h>
#include <string.h>
#ifdef HAVE_STRINGS_H
diff --git a/negotiator/default.c b/negotiator/default.c
index 9a5b6963272..b1f9f153372 100644
--- a/negotiator/default.c
+++ b/negotiator/default.c
@@ -174,7 +174,7 @@ static int ack(struct fetch_negotiator *n, struct commit *c)
return known_to_be_common;
}
-static void release(struct fetch_negotiator *n)
+static void release_negotiator(struct fetch_negotiator *n)
{
clear_prio_queue(&((struct negotiation_state *)n->data)->rev_list);
FREE_AND_NULL(n->data);
@@ -187,7 +187,7 @@ void default_negotiator_init(struct fetch_negotiator *negotiator)
negotiator->add_tip = add_tip;
negotiator->next = next;
negotiator->ack = ack;
- negotiator->release = release;
+ negotiator->release_negotiator = release_negotiator;
negotiator->data = CALLOC_ARRAY(ns, 1);
ns->rev_list.compare = compare_commits_by_commit_date;
diff --git a/negotiator/noop.c b/negotiator/noop.c
index de39028ab7f..82089654d8b 100644
--- a/negotiator/noop.c
+++ b/negotiator/noop.c
@@ -30,7 +30,7 @@ static int ack(struct fetch_negotiator *n UNUSED, struct commit *c UNUSED)
return 0;
}
-static void release(struct fetch_negotiator *n UNUSED)
+static void release_negotiator(struct fetch_negotiator *n UNUSED)
{
/* nothing to release */
}
@@ -41,6 +41,6 @@ void noop_negotiator_init(struct fetch_negotiator *negotiator)
negotiator->add_tip = add_tip;
negotiator->next = next;
negotiator->ack = ack;
- negotiator->release = release;
+ negotiator->release_negotiator = release_negotiator;
negotiator->data = NULL;
}
diff --git a/negotiator/skipping.c b/negotiator/skipping.c
index 5b91520430c..783b3f27e63 100644
--- a/negotiator/skipping.c
+++ b/negotiator/skipping.c
@@ -243,7 +243,7 @@ static int ack(struct fetch_negotiator *n, struct commit *c)
return known_to_be_common;
}
-static void release(struct fetch_negotiator *n)
+static void release_negotiator(struct fetch_negotiator *n)
{
clear_prio_queue(&((struct data *)n->data)->rev_list);
FREE_AND_NULL(n->data);
@@ -256,7 +256,7 @@ void skipping_negotiator_init(struct fetch_negotiator *negotiator)
negotiator->add_tip = add_tip;
negotiator->next = next;
negotiator->ack = ack;
- negotiator->release = release;
+ negotiator->release_negotiator = release_negotiator;
negotiator->data = CALLOC_ARRAY(data, 1);
data->rev_list.compare = compare;
diff --git a/object-file.c b/object-file.c
index 7c7afe57936..28e69ed1e33 100644
--- a/object-file.c
+++ b/object-file.c
@@ -43,7 +43,9 @@
#include "setup.h"
#include "submodule.h"
#include "fsck.h"
-
+#ifdef __MVS__
+#include <_Ccsid.h>
+#endif
/* The maximum size for an object header. */
#define MAX_HEADER_LEN 32
@@ -2478,6 +2480,68 @@ int index_fd(struct index_state *istate, struct object_id *oid,
return ret;
}
+#ifdef __MVS__
+void validate_codeset(struct index_state *istate, const char *path, int* autoconvertToASCII) {
+ struct conv_attrs ca;
+ struct stat st;
+ unsigned short attr_ccsid;
+ unsigned short file_ccsid;
+
+ if (ignore_file_tags)
+ return;
+
+ *autoconvertToASCII = 0;
+ convert_attrs(istate, &ca, path);
+ if (ca.attr_action == CRLF_BINARY) {
+ attr_ccsid = FT_BINARY;
+ }
+ else if (ca.working_tree_encoding) {
+ attr_ccsid = __toCcsid(ca.working_tree_encoding);
+ }
+ else
+ attr_ccsid = 819;
+
+ if (stat(path, &st) < 0)
+ return;
+
+ file_ccsid = st.st_tag.ft_ccsid;
+
+ if (file_ccsid == FT_UNTAGGED) {
+ die("File %s is untagged, set the correct file tag (using the chtag command).", path);
+ }
+
+ if (attr_ccsid != file_ccsid) {
+ if (file_ccsid == 1047 && attr_ccsid == 819) {
+ *autoconvertToASCII = 1;
+ return;
+ }
+ // Allow tag mixing of 819 and 1208
+ if ((file_ccsid == 819 || file_ccsid == 1208) && (attr_ccsid == 1208 || attr_ccsid == 819)) {
+ return;
+ }
+ // Don't check for binary files, just add them
+ if (attr_ccsid == FT_BINARY)
+ return;
+
+ char attr_csname[_XOPEN_PATH_MAX] = {0};
+ char file_csname[_XOPEN_PATH_MAX] = {0};
+ if (attr_ccsid != FT_BINARY) {
+ __toCSName(attr_ccsid, attr_csname);
+ } else {
+ snprintf(attr_csname, _XOPEN_PATH_MAX, "%s", "binary");
+ }
+ if (file_ccsid != FT_BINARY) {
+ __toCSName(file_ccsid, file_csname);
+ } else {
+ snprintf(file_csname, _XOPEN_PATH_MAX, "%s", "binary");
+ }
+ die("%s added file: file tag (%s) does not match working-tree-encoding (%s)", path, file_csname, attr_csname);
+ }
+}
+#endif
+
+
+
int index_path(struct index_state *istate, struct object_id *oid,
const char *path, struct stat *st, unsigned flags)
{
@@ -2485,11 +2549,25 @@ int index_path(struct index_state *istate, struct object_id *oid,
struct strbuf sb = STRBUF_INIT;
int rc = 0;
+#ifdef __MVS__
+ struct conv_attrs ca;
+ int autocvtToASCII;
+#endif
+
switch (st->st_mode & S_IFMT) {
case S_IFREG:
+#ifdef __MVS__
+ validate_codeset(istate, path, &autocvtToASCII);
+#endif
fd = open(path, O_RDONLY);
if (fd < 0)
return error_errno("open(\"%s\")", path);
+
+#ifdef __MVS__
+ if (!autocvtToASCII)
+ __disableautocvt(fd);
+#endif
+
if (index_fd(istate, oid, fd, st, OBJ_BLOB, path, flags) < 0)
return error(_("%s: failed to insert into database"),
path);
diff --git a/read-cache.c b/read-cache.c
index 080bd39713b..75c06121302 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -205,6 +205,9 @@ static int ce_compare_data(struct index_state *istate,
int fd = git_open_cloexec(ce->name, O_RDONLY);
if (fd >= 0) {
+#ifdef __MVS__
+ __disableautocvt(fd);
+#endif
struct object_id oid;
if (!index_fd(istate, &oid, fd, st, OBJ_BLOB, ce->name, 0))
match = !oideq(&oid, &ce->oid);
diff --git a/utf8.c b/utf8.c
index 6a0dd25b0fe..b9cb56abf14 100644
--- a/utf8.c
+++ b/utf8.c
@@ -590,6 +590,17 @@ char *reencode_string_len(const char *in, size_t insz,
#endif
}
+#ifdef __MVS__
+ //HACK: For backwards compat, ISO8859-1 really means utf-8 in the z/OS world
+ if (strcasecmp("ISO8859-1", in_encoding) == 0) {
+ in_encoding = "UTF-8";
+ out_encoding = "UTF-8";
+ }
+ if (strcasecmp("ISO8859-1", out_encoding) == 0) {
+ in_encoding = "UTF-8";
+ out_encoding = "UTF-8";
+ }
+#endif
conv = iconv_open(out_encoding, in_encoding);
if (conv == (iconv_t) -1) {
in_encoding = fallback_encoding(in_encoding);
--
gitgitgadget
^ permalink raw reply related
* [PATCH 06/13] spaces and errors fix Handled git pipeline errors
From: Haritha D via GitGitGadget @ 2023-11-13 10:24 UTC (permalink / raw)
To: git; +Cc: Haritha, Haritha D
In-Reply-To: <pull.1537.git.git.1699871056.gitgitgadget@gmail.com>
From: Haritha D <harithamma.d@ibm.com>
This PR has fixes to enable build on z/OS
Signed-off-by: Harithamma D <harithamma.d@ibm.com>
---
convert.c | 2 +-
fetch-pack.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/convert.c b/convert.c
index d3f204b4c29..7fe107710ec 100644
--- a/convert.c
+++ b/convert.c
@@ -1314,7 +1314,7 @@ static int git_path_check_ident(struct attr_check_item *check)
static struct attr_check *check;
static const char* get_platform(void) {
- struct utsname uname_info;
+ struct utsname uname_info = {0};
char *result = NULL;
if(!uname_info.sysname[0])
{
diff --git a/fetch-pack.c b/fetch-pack.c
index f40b90dfa65..c1f2e714f8e 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1853,7 +1853,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
die("fsck failed");
if (negotiator)
- negotiator->release(negotiator);
+ negotiator->release_negotiator(negotiator);
oidset_clear(&common);
return ref;
--
gitgitgadget
^ permalink raw reply related
* [PATCH 05/13] fixes for build errors
From: Haritha D via GitGitGadget @ 2023-11-13 10:24 UTC (permalink / raw)
To: git; +Cc: Haritha, Haritha D
In-Reply-To: <pull.1537.git.git.1699871056.gitgitgadget@gmail.com>
From: Haritha D <harithamma.d@ibm.com>
This patch has fixes for build errors
Signed-off-by: Haritha D <harithamma.d@ibm.com>
---
convert.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/convert.c b/convert.c
index da05f6c2e51..d3f204b4c29 100644
--- a/convert.c
+++ b/convert.c
@@ -1315,8 +1315,8 @@ static struct attr_check *check;
static const char* get_platform(void) {
struct utsname uname_info;
- char *result;
- if(!uname_info.sysname)
+ char *result = NULL;
+ if(!uname_info.sysname[0])
{
int index=0;
result = (char *)malloc(strlen(uname_info.sysname)+1);
--
gitgitgadget
^ permalink raw reply related
* [PATCH 04/13] fixes for build errors Handled git pipeline errorse
From: Haritha D via GitGitGadget @ 2023-11-13 10:24 UTC (permalink / raw)
To: git; +Cc: Haritha, Haritha D
In-Reply-To: <pull.1537.git.git.1699871056.gitgitgadget@gmail.com>
From: Haritha D <harithamma.d@ibm.com>
This PR has fixes to enable build on z/OS
Signed-off-by: Harithamma D <harithamma.d@ibm.com>
---
convert.c | 4 ++--
fetch-negotiator.h | 2 +-
fetch-pack.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/convert.c b/convert.c
index 17cc849efed..da05f6c2e51 100644
--- a/convert.c
+++ b/convert.c
@@ -1313,13 +1313,13 @@ static int git_path_check_ident(struct attr_check_item *check)
static struct attr_check *check;
-static const char* get_platform() {
+static const char* get_platform(void) {
struct utsname uname_info;
char *result;
if(!uname_info.sysname)
{
- result = (char *)malloc(strlen(uname_info.sysname)+1);
int index=0;
+ result = (char *)malloc(strlen(uname_info.sysname)+1);
while(index <= strlen(uname_info.sysname))
{
*result = uname_info.sysname[index];
diff --git a/fetch-negotiator.h b/fetch-negotiator.h
index e348905a1f0..2e19ef247f9 100644
--- a/fetch-negotiator.h
+++ b/fetch-negotiator.h
@@ -47,7 +47,7 @@ struct fetch_negotiator {
*/
int (*ack)(struct fetch_negotiator *, struct commit *);
- void (*release)(struct fetch_negotiator *);
+ void (*release_negotiator)(struct fetch_negotiator *);
/* internal use */
void *data;
diff --git a/fetch-pack.c b/fetch-pack.c
index 26999e3b659..f40b90dfa65 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1232,7 +1232,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
all_done:
if (negotiator)
- negotiator->release(negotiator);
+ negotiator->release_negotiator(negotiator);
return ref;
}
--
gitgitgadget
^ permalink raw reply related
* [PATCH 03/13] spaces and errors fix Handled git pipeline errors
From: Haritha D via GitGitGadget @ 2023-11-13 10:24 UTC (permalink / raw)
To: git; +Cc: Haritha, Haritha D
In-Reply-To: <pull.1537.git.git.1699871056.gitgitgadget@gmail.com>
From: Haritha D <harithamma.d@ibm.com>
This PR has fixes to enable build on z/OS
Signed-off-by: Harithamma D <harithamma.d@ibm.com>
---
builtin/hash-object.c | 6 +++---
convert.c | 22 +++++++++++++++++-----
entry.c | 22 +++++++++++-----------
object-file.c | 6 +++---
4 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index b33b32ff977..9129658a37c 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -62,8 +62,8 @@ static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
# include <stdio.h>
# include <stdlib.h>
- int setbinaryfd(int fd)
- {
+int setbinaryfd(int fd)
+{
attrib_t attr;
int rc;
@@ -74,7 +74,7 @@ static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
rc = __fchattr(fd, &attr, sizeof(attr));
return rc;
- }
+}
# endif
#endif
diff --git a/convert.c b/convert.c
index 4f14ff6f1ed..17cc849efed 100644
--- a/convert.c
+++ b/convert.c
@@ -1315,15 +1315,28 @@ static struct attr_check *check;
static const char* get_platform() {
struct utsname uname_info;
+ char *result;
+ if(!uname_info.sysname)
+ {
+ result = (char *)malloc(strlen(uname_info.sysname)+1);
+ int index=0;
+ while(index <= strlen(uname_info.sysname))
+ {
+ *result = uname_info.sysname[index];
+ ++result;
+ ++index;
+ }
+ }
if (uname(&uname_info))
die(_("uname() failed with error '%s' (%d)\n"),
strerror(errno),
errno);
- if (!strcmp(uname_info.sysname, "OS/390"))
- return "zos";
- return uname_info.sysname;
+ if (!strcmp(uname_info.sysname, "OS/390"))
+ result="zos";
+
+ return result;
}
@@ -1331,11 +1344,10 @@ void convert_attrs(struct index_state *istate,
struct conv_attrs *ca, const char *path)
{
struct attr_check_item *ccheck = NULL;
- struct strbuf platform_working_tree_encoding = STRBUF_INIT;
+ struct strbuf platform_working_tree_encoding = STRBUF_INIT;
strbuf_addf(&platform_working_tree_encoding, "%s-working-tree-encoding", get_platform());
-
if (!check) {
check = attr_check_initl("crlf", "ident", "filter",
"eol", "text", "working-tree-encoding", platform_working_tree_encoding.buf,
diff --git a/entry.c b/entry.c
index df6feb2234b..f2a7b2adbf5 100644
--- a/entry.c
+++ b/entry.c
@@ -130,17 +130,17 @@ int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st)
void tag_file_as_working_tree_encoding(struct index_state *istate, char* path, int fd) {
struct conv_attrs ca;
convert_attrs(istate, &ca, path);
- if (ca.attr_action != CRLF_BINARY) {
- if (ca.working_tree_encoding)
- __chgfdcodeset(fd, ca.working_tree_encoding);
- else
- __setfdtext(fd);
- }
- else {
- __setfdbinary(fd);
- }
-
- __disableautocvt(fd);
+ if (ca.attr_action != CRLF_BINARY) {
+ if (ca.working_tree_encoding)
+ __chgfdcodeset(fd, ca.working_tree_encoding);
+ else
+ __setfdtext(fd);
+ }
+ else {
+ __setfdbinary(fd);
+ }
+
+ __disableautocvt(fd);
}
#endif
diff --git a/object-file.c b/object-file.c
index 28e69ed1e33..562d1344422 100644
--- a/object-file.c
+++ b/object-file.c
@@ -2557,15 +2557,15 @@ int index_path(struct index_state *istate, struct object_id *oid,
switch (st->st_mode & S_IFMT) {
case S_IFREG:
#ifdef __MVS__
- validate_codeset(istate, path, &autocvtToASCII);
+ validate_codeset(istate, path, &autocvtToASCII);
#endif
fd = open(path, O_RDONLY);
if (fd < 0)
return error_errno("open(\"%s\")", path);
#ifdef __MVS__
- if (!autocvtToASCII)
- __disableautocvt(fd);
+ if (!autocvtToASCII)
+ __disableautocvt(fd);
#endif
if (index_fd(istate, oid, fd, st, OBJ_BLOB, path, flags) < 0)
--
gitgitgadget
^ permalink raw reply related
* [PATCH 01/13] Enabling z/OS workflow for git
From: Haritha D via GitGitGadget @ 2023-11-13 10:24 UTC (permalink / raw)
To: git; +Cc: Haritha, Haritha D
In-Reply-To: <pull.1537.git.git.1699871056.gitgitgadget@gmail.com>
From: Haritha D <harithamma.d@ibm.com>
Our team ported Git to z/OS w/ significant modifcation.
This patch is Initial Config
Signed-off-by: Haritha D <harithamma.d@ibm.com>
---
config.mak.uname | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/config.mak.uname b/config.mak.uname
index 3bb03f423a0..6ba9b707006 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -625,6 +625,26 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
SHELL_PATH = /usr/coreutils/bin/bash
endif
+
+ifeq ($(uname_S),OS/390)
+ PERL_PATH = perl
+ PERL_PATH_FOR_SCRIPTS = /bin/env perl
+ SHELL_PATH = bash
+ SHELL_PATH_FOR_SCRIPTS = /bin/env bash
+ PYTHON_PATH = python
+ NO_SYS_POLL_H = YesPlease
+ NO_STRCASESTR = YesPlease
+ NO_REGEX = YesPlease
+ NO_MMAP = YesPlease
+ NO_NSEC = YesPlease
+ NO_STRLCPY = YesPlease
+ NO_MKDTEMP = YesPlease
+ NO_MEMMEM = YesPlease
+ NO_GECOS_IN_PWENT = YesPlease
+ HAVE_STRINGS_H = YesPlease
+ NEEDS_MODE_TRANSLATION = YesPlease
+endif
+
ifeq ($(uname_S),MINGW)
ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
$(error "Building with MSys is no longer supported")
--
gitgitgadget
^ permalink raw reply related
* [PATCH 00/13] Enabling z/OS workflow for git
From: Haritha via GitGitGadget @ 2023-11-13 10:24 UTC (permalink / raw)
To: git; +Cc: Haritha
z/OS is an IBM mainframe operating system, also known as OS/390. Our team
has been actively involved in porting Git to z/OS and we have made
significant modifications to facilitate this process. The patch below is the
initial configuration for z/OS. I also have few follow up changes and I will
send that after these changes are approved. Please let me know if there are
any concerns.
Haritha D (13):
Enabling z/OS workflow for git
Enable builds for z/OS.
spaces and errors fix Handled git pipeline errors
fixes for build errors Handled git pipeline errorse
fixes for build errors
spaces and errors fix Handled git pipeline errors
spaces and errors fix Handled git pipeline errors
platform_name fix Handled git pipeline errors
strncpy fix Handled git pipeline errors
strncpy fix Handled git pipeline errors
strncpy fix Handled git pipeline errors
Handled git pipeline errors - Memory leak
Handled git pipeline errors - z/OS enable
Makefile | 21 +++++++++---
builtin.h | 3 ++
builtin/archive.c | 6 ++++
builtin/hash-object.c | 28 +++++++++++++++
combine-diff.c | 4 +++
config.c | 7 ++++
config.mak.uname | 20 +++++++++++
configure.ac | 3 ++
convert.c | 58 +++++++++++++++++++++++++++----
copy.c | 3 ++
diff.c | 11 ++++++
entry.c | 26 ++++++++++++++
environment.c | 3 ++
fetch-negotiator.h | 2 +-
fetch-pack.c | 4 +--
git-compat-util.h | 8 +++++
negotiator/default.c | 4 +--
negotiator/noop.c | 4 +--
negotiator/skipping.c | 4 +--
object-file.c | 80 ++++++++++++++++++++++++++++++++++++++++++-
read-cache.c | 3 ++
utf8.c | 11 ++++++
22 files changed, 292 insertions(+), 21 deletions(-)
base-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1537%2FHarithaIBM%2Fenablezos-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1537/HarithaIBM/enablezos-v1
Pull-Request: https://github.com/git/git/pull/1537
--
gitgitgadget
^ permalink raw reply
* Re: [PATCH v4 1/3] t/lib-httpd: dynamically detect httpd and modules path
From: Patrick Steinhardt @ 2023-11-13 7:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Jeff King
In-Reply-To: <xmqqo7g1tb06.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 1168 bytes --]
On Sat, Nov 11, 2023 at 09:00:09AM +0900, Junio C Hamano wrote:
> Patrick Steinhardt <ps@pks.im> writes:
>
> > +if test -x "$DEFAULT_HTTPD_PATH"
> > +then
> > + DETECTED_HTTPD_ROOT="$("$DEFAULT_HTTPD_PATH" -V | sed -n 's/^ -D HTTPD_ROOT="\(.*\)"$/\1/p')"
> > +fi
>
> With this patch, my test run starts like so:
>
> rm -f -r 'test-results'
> *** prove ***
> apache2: Could not open configuration file /etc/apache2/apache2.conf: No such file or directory
> ...
>
> I find the error message leaking mildly annoying, and would suggest
> doing something like the following on top.
>
> diff --git c/t/lib-httpd.sh w/t/lib-httpd.sh
> index 0a74922d7f..03493ee72b 100644
> --- c/t/lib-httpd.sh
> +++ w/t/lib-httpd.sh
> @@ -68,7 +68,7 @@ done
>
> if test -x "$DEFAULT_HTTPD_PATH"
> then
> - DETECTED_HTTPD_ROOT="$("$DEFAULT_HTTPD_PATH" -V | sed -n 's/^ -D HTTPD_ROOT="\(.*\)"$/\1/p')"
> + DETECTED_HTTPD_ROOT="$("$DEFAULT_HTTPD_PATH" -V 2>/dev/null | sed -n 's/^ -D HTTPD_ROOT="\(.*\)"$/\1/p')"
> fi
>
> for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \
Yup, makes sense. Thanks for the tweak.
Patrick
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply
* Re: [PATCH v4 0/3] t: improve compatibility with NixOS
From: Patrick Steinhardt @ 2023-11-13 7:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Jeff King
In-Reply-To: <xmqqh6lttaj4.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 1741 bytes --]
On Sat, Nov 11, 2023 at 09:10:23AM +0900, Junio C Hamano wrote:
> Patrick Steinhardt <ps@pks.im> writes:
>
> > Three changes compared to v3:
> >
> > - Switched from `test <expr> -a <expr>` to `test <expr> && test
> > <expr>`.
> >
> > - Improved the commit message to explain why the new
> > runtime-detected paths are only used as a fallback.
> >
> > - Rebased on top of 0e3b67e2aa (ci: add support for GitLab CI,
> > 2023-11-09), which has been merged to `next` and caused conflicts.
>
> Please, no. "The other topic has been merged to 'next'" is *not* a
> good reason to do this. Before that, the other topic was in 'seen'
> and causing conflicts already, so getting into 'next' did not create
> any new reason for rebasing.
>
> I'll manage this time, but please do not do such a rebase unless you
> are asked to do so. The rebase will force me to do (1) detach from
> 'next' and apply these, (2) discard the result and detach from the
> base of where the previous iteration is queued, (3) apply the new
> iteration with "am -3" to undo the rebase, before I can compare the
> new iteration with the old iteration.
Fair enough. I assumed that it would ease your workload instead of
creating more work for you. But I'll keep in mind that it doesn't and
refrain from doing this in the future.
> > Technically speaking this series also depends on 0763c3a2c4 (http:
> > update curl http/2 info matching for curl 8.3.0, 2023-09-15), without
> > which the tests will fail on NixOS machines with a recent libcurl.
>
> Thanks for that note. This topic has been queued on top of
> v2.43.0-rc1 which has 0763c3a2c4, so we'd be safe.
>
> Will queue.
Thanks.
Patrick
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply
* Re: [PATCH v2 1/4] global: convert trivial usages of `test <expr> -a/-o <expr>`
From: Patrick Steinhardt @ 2023-11-13 7:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jeff King, git
In-Reply-To: <xmqqr0kxrvij.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]
On Sat, Nov 11, 2023 at 09:20:04AM +0900, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > I am not so surprised that this one was missed, though. I didn't
> > point this one out during my review of the previous round, either,
> > and not everybody is as careful as you are.
>
> Ah, sorry, thist came out in a way I did not mean to.
>
> I didn't mean "I did not point it out explicitly. It is not
> surprising if a contributor who was not careful did not find it on
> their own and took initiative to fix it themselves".
>
> I meant "I failed to spot it myself hence I didn't point it out in
> my review---I was not being so careful to aim for thoroughly cover
> and find all the similar issues".
>
> In any case, I'll tweak it while queueing. Thanks for noticing.
Thanks indeed, I missed this instance as well when I scanned for any
additional subshells.
Patrick
> diff --git i/t/valgrind/valgrind.sh w/t/valgrind/valgrind.sh
> index 9fbf90cee7..3c8ee19975 100755
> --- i/t/valgrind/valgrind.sh
> +++ w/t/valgrind/valgrind.sh
> @@ -23,7 +23,7 @@ memcheck)
> VALGRIND_MAJOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*\([0-9]*\)')
> VALGRIND_MINOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*[0-9]*\.\([0-9]*\)')
> test 3 -gt "$VALGRIND_MAJOR" ||
> - ( test 3 -eq "$VALGRIND_MAJOR" && test 4 -gt "$VALGRIND_MINOR" ) ||
> + { test 3 -eq "$VALGRIND_MAJOR" && test 4 -gt "$VALGRIND_MINOR"; } ||
> TOOL_OPTIONS="$TOOL_OPTIONS --track-origins=yes"
> ;;
> *)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply
* What's cooking in git.git (Nov 2023, #05; Mon, 13)
From: Junio C Hamano @ 2023-11-13 4:29 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a
future release). Commits prefixed with '-' are only in 'seen', and
aren't considered "accepted" at all and may be annotated with an URL
to a message that raises issues but they are no means exhaustive. A
topic without enough support may be discarded after a long period of
no activity (of course they can be resubmit when new interests
arise).
The Git 2.43-rc1 has been tagged and soon Git 2.43-rc2 will follow
this week.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* jk/chunk-bounds-more (2023-11-09) 9 commits
(merged to 'next' on 2023-11-13 at 3df4b18bea)
+ commit-graph: mark chunk error messages for translation
+ commit-graph: drop verify_commit_graph_lite()
+ commit-graph: check order while reading fanout chunk
+ commit-graph: use fanout value for graph size
+ commit-graph: abort as soon as we see a bogus chunk
+ commit-graph: clarify missing-chunk error messages
+ commit-graph: drop redundant call to "lite" verification
+ midx: check consistency of fanout table
+ commit-graph: handle overflow in chunk_size checks
(this branch is used by tb/pair-chunk-expect.)
Code clean-up for jk/chunk-bounds topic.
Will cook in 'next'.
source: <20231109070310.GA2697602@coredump.intra.peff.net>
* ps/httpd-tests-on-nixos (2023-11-11) 3 commits
(merged to 'next' on 2023-11-13 at 81bd6f5334)
+ t9164: fix inability to find basename(1) in Subversion hooks
+ t/lib-httpd: stop using legacy crypt(3) for authentication
+ t/lib-httpd: dynamically detect httpd and modules path
Portability tweak.
Will merge to 'master'.
source: <cover.1699596457.git.ps@pks.im>
* ss/format-patch-use-encode-headers-for-cover-letter (2023-11-10) 1 commit
- format-patch: fix ignored encode_email_headers for cover letter
"git format-patch --encode-email-headers" ignored the option when
preparing the cover letter, which has been corrected.
Will merge to 'next'.
source: <20231109111950.387219-1-contact@emersion.fr>
* ps/ban-a-or-o-operator-with-test (2023-11-11) 4 commits
- Makefile: stop using `test -o` when unlinking duplicate executables
- contrib/subtree: convert subtree type check to use case statement
- contrib/subtree: stop using `-o` to test for number of args
- global: convert trivial usages of `test <expr> -a/-o <expr>`
Test and shell scripts clean-up.
Will merge to 'next'.
source: <cover.1699609940.git.ps@pks.im>
* vd/glossary-dereference-peel (2023-11-10) 1 commit
- glossary: add definitions for dereference & peel
"To dereference" and "to peel" were sometimes used in in-code
comments and documentation but without description in the glossary.
Expecting an update.
cf. <xmqq1qcyxxri.fsf@gitster.g>
source: <pull.1610.git.1699574277143.gitgitgadget@gmail.com>
* ak/rebase-autosquash (2023-11-13) 4 commits
- rebase: rewrite --(no-)autosquash documentation
- rebase: test autosquash with and without -i
- rebase: support --autosquash without -i
- rebase: fully ignore rebase.autoSquash without -i
source: <20231111132720.78877-1-andy.koppe@gmail.com>
--------------------------------------------------
[Stalled]
* pw/rebase-sigint (2023-09-07) 1 commit
- rebase -i: ignore signals when forking subprocesses
If the commit log editor or other external programs (spawned via
"exec" insn in the todo list) receive internactive signal during
"git rebase -i", it caused not just the spawned program but the
"Git" process that spawned them, which is often not what the end
user intended. "git" learned to ignore SIGINT and SIGQUIT while
waiting for these subprocesses.
Expecting a reroll.
cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
- cherry-pick: refuse cherry-pick sequence if index is dirty
"git cherry-pick A" that replays a single commit stopped before
clobbering local modification, but "git cherry-pick A..B" did not,
which has been corrected.
Expecting a reroll.
cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
- diff-lib: fix check_removed() when fsmonitor is active
- Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
- Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
(this branch uses jc/fake-lstat.)
The optimization based on fsmonitor in the "diff --cached"
codepath is resurrected with the "fake-lstat" introduced earlier.
It is unknown if the optimization is worth resurrecting, but in case...
source: <xmqqr0n0h0tw.fsf@gitster.g>
--------------------------------------------------
[Cooking]
* vd/for-each-ref-unsorted-optimization (2023-11-07) 9 commits
- t/perf: add perf tests for for-each-ref
- for-each-ref: add option to fully dereference tags
- ref-filter.c: filter & format refs in the same callback
- ref-filter.c: refactor to create common helper functions
- ref-filter.h: add functions for filter/format & format-only
- ref-filter.h: move contains caches into filter
- ref-filter.h: add max_count and omit_empty to ref_format
- for-each-ref: clarify interaction of --omit-empty & --count
- ref-filter.c: really don't sort when using --no-sort
"git for-each-ref --no-sort" still sorted the refs alphabetically
which paid non-trivial cost. It has been redefined to show output
in an unspecified order, to allow certain optimizations to take
advantage of.
Expecting a reroll.
cf. <dbcbcf0e-aeee-4bb9-9e39-e2e85194d083@github.com>
source: <pull.1609.git.1699320361.gitgitgadget@gmail.com>
* jw/git-add-attr-pathspec (2023-11-04) 1 commit
(merged to 'next' on 2023-11-13 at b61be94e4d)
+ attr: enable attr pathspec magic for git-add and git-stash
"git add" and "git stash" learned to support the ":(attr:...)"
magic pathspec.
Will cook in 'next'.
source: <20231103163449.1578841-1-jojwang@google.com>
* ps/ci-gitlab (2023-11-09) 8 commits
(merged to 'next' on 2023-11-10 at ea7ed67945)
+ ci: add support for GitLab CI
+ ci: install test dependencies for linux-musl
+ ci: squelch warnings when testing with unusable Git repo
+ ci: unify setup of some environment variables
+ ci: split out logic to set up failed test artifacts
+ ci: group installation of Docker dependencies
+ ci: make grouping setup more generic
+ ci: reorder definitions for grouping functions
Add support for GitLab CI.
Will cook in 'next'.
source: <cover.1699514143.git.ps@pks.im>
* ps/ref-tests-update (2023-11-03) 10 commits
(merged to 'next' on 2023-11-13 at dc26e55d6f)
+ t: mark several tests that assume the files backend with REFFILES
+ t7900: assert the absence of refs via git-for-each-ref(1)
+ t7300: assert exact states of repo
+ t4207: delete replace references via git-update-ref(1)
+ t1450: convert tests to remove worktrees via git-worktree(1)
+ t: convert tests to not access reflog via the filesystem
+ t: convert tests to not access symrefs via the filesystem
+ t: convert tests to not write references via the filesystem
+ t: allow skipping expected object ID in `ref-store update-ref`
+ Merge branch 'ps/show-ref' into ps/ref-tests-update
Update ref-related tests.
Will cook in 'next'.
source: <cover.1698914571.git.ps@pks.im>
* jx/fetch-atomic-error-message-fix (2023-10-19) 2 commits
- fetch: no redundant error message for atomic fetch
- t5574: test porcelain output of atomic fetch
"git fetch --atomic" issued an unnecessary empty error message,
which has been corrected.
Expecting an update.
cf. <ZTjQIrCgSANAT8wR@tanuki>
source: <ced46baeb1c18b416b4b4cc947f498bea2910b1b.1697725898.git.zhiyou.jx@alibaba-inc.com>
* js/bugreport-in-the-same-minute (2023-10-16) 1 commit
- bugreport: include +i in outfile suffix as needed
Instead of auto-generating a filename that is already in use for
output and fail the command, `git bugreport` learned to fuzz the
filename to avoid collisions with existing files.
Expecting a reroll.
cf. <ZTtZ5CbIGETy1ucV.jacob@initialcommit.io>
source: <20231016214045.146862-2-jacob@initialcommit.io>
* kh/t7900-cleanup (2023-10-17) 9 commits
- t7900: fix register dependency
- t7900: factor out packfile dependency
- t7900: fix `print-args` dependency
- t7900: fix `pfx` dependency
- t7900: factor out common schedule setup
- t7900: factor out inheritance test dependency
- t7900: create commit so that branch is born
- t7900: setup and tear down clones
- t7900: remove register dependency
Test clean-up.
Perhaps discard?
cf. <655ca147-c214-41be-919d-023c1b27b311@app.fastmail.com>
source: <cover.1697319294.git.code@khaugsbakk.name>
* tb/merge-tree-write-pack (2023-10-23) 5 commits
- builtin/merge-tree.c: implement support for `--write-pack`
- bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
- bulk-checkin: introduce `index_blob_bulk_checkin_incore()`
- bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types
- bulk-checkin: extract abstract `bulk_checkin_source`
"git merge-tree" learned "--write-pack" to record its result
without creating loose objects.
Broken when an object created during a merge is needed to continue merge
cf. <CABPp-BEfy9VOvimP9==ry_rZXu=metOQ8s=_-XiG_Pdx9c06Ww@mail.gmail.com>
source: <cover.1698101088.git.me@ttaylorr.com>
* tb/pair-chunk-expect (2023-11-10) 8 commits
- midx: read `OOFF` chunk with `pair_chunk_expect()`
- midx: read `OIDL` chunk with `pair_chunk_expect()`
- commit-graph: read `BIDX` chunk with `pair_chunk_expect()`
- commit-graph: read `GDAT` chunk with `pair_chunk_expect()`
- commit-graph: read `CDAT` chunk with `pair_chunk_expect()`
- commit-graph: read `OIDL` chunk with `pair_chunk_expect()`
- chunk-format: introduce `pair_chunk_expect()` helper
- Merge branch 'jk/chunk-bounds-more' into HEAD
(this branch uses jk/chunk-bounds-more.)
Further code clean-up.
Needs review.
source: <cover.1699569246.git.me@ttaylorr.com>
* tb/path-filter-fix (2023-10-18) 17 commits
- bloom: introduce `deinit_bloom_filters()`
- commit-graph: reuse existing Bloom filters where possible
- object.h: fix mis-aligned flag bits table
- commit-graph: drop unnecessary `graph_read_bloom_data_context`
- commit-graph.c: unconditionally load Bloom filters
- bloom: prepare to discard incompatible Bloom filters
- bloom: annotate filters with hash version
- commit-graph: new filter ver. that fixes murmur3
- repo-settings: introduce commitgraph.changedPathsVersion
- t4216: test changed path filters with high bit paths
- t/helper/test-read-graph: implement `bloom-filters` mode
- bloom.h: make `load_bloom_filter_from_graph()` public
- t/helper/test-read-graph.c: extract `dump_graph_info()`
- gitformat-commit-graph: describe version 2 of BDAT
- commit-graph: ensure Bloom filters are read with consistent settings
- revision.c: consult Bloom filters for root commits
- t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()`
The Bloom filter used for path limited history traversal was broken
on systems whose "char" is unsigned; update the implementation and
bump the format version to 2.
Needs (hopefully final and quick) review.
source: <cover.1697653929.git.me@ttaylorr.com>
* cc/git-replay (2023-11-03) 14 commits
- replay: stop assuming replayed branches do not diverge
- replay: add --contained to rebase contained branches
- replay: add --advance or 'cherry-pick' mode
- replay: use standard revision ranges
- replay: make it a minimal server side command
- replay: remove HEAD related sanity check
- replay: remove progress and info output
- replay: add an important FIXME comment about gpg signing
- replay: change rev walking options
- replay: introduce pick_regular_commit()
- replay: die() instead of failing assert()
- replay: start using parse_options API
- replay: introduce new builtin
- t6429: remove switching aspects of fast-rebase
Introduce "git replay", a tool meant on the server side without
working tree to recreate a history.
Comments?
source: <20231102135151.843758-1-christian.couder@gmail.com>
* ak/color-decorate-symbols (2023-10-23) 7 commits
- log: add color.decorate.pseudoref config variable
- refs: exempt pseudorefs from pattern prefixing
- refs: add pseudorefs array and iteration functions
- log: add color.decorate.ref config variable
- log: add color.decorate.symbol config variable
- log: use designated inits for decoration_colors
- config: restructure color.decorate documentation
A new config for coloring.
Needs review.
source: <20231023221143.72489-1-andy.koppe@gmail.com>
* js/update-urls-in-doc-and-comment (2023-09-26) 4 commits
- doc: refer to internet archive
- doc: update links for andre-simon.de
- doc: update links to current pages
- doc: switch links to https
Stale URLs have been updated to their current counterparts (or
archive.org) and HTTP links are replaced with working HTTPS links.
Needs review.
source: <pull.1589.v2.git.1695553041.gitgitgadget@gmail.com>
* la/trailer-cleanups (2023-10-20) 3 commits
- trailer: use offsets for trailer_start/trailer_end
- trailer: find the end of the log message
- commit: ignore_non_trailer computes number of bytes to ignore
Code clean-up.
Comments?
source: <pull.1563.v5.git.1697828495.gitgitgadget@gmail.com>
* eb/hash-transition (2023-10-02) 30 commits
- t1016-compatObjectFormat: add tests to verify the conversion between objects
- t1006: test oid compatibility with cat-file
- t1006: rename sha1 to oid
- test-lib: compute the compatibility hash so tests may use it
- builtin/ls-tree: let the oid determine the output algorithm
- object-file: handle compat objects in check_object_signature
- tree-walk: init_tree_desc take an oid to get the hash algorithm
- builtin/cat-file: let the oid determine the output algorithm
- rev-parse: add an --output-object-format parameter
- repository: implement extensions.compatObjectFormat
- object-file: update object_info_extended to reencode objects
- object-file-convert: convert commits that embed signed tags
- object-file-convert: convert commit objects when writing
- object-file-convert: don't leak when converting tag objects
- object-file-convert: convert tag objects when writing
- object-file-convert: add a function to convert trees between algorithms
- object: factor out parse_mode out of fast-import and tree-walk into in object.h
- cache: add a function to read an OID of a specific algorithm
- tag: sign both hashes
- commit: export add_header_signature to support handling signatures on tags
- commit: convert mergetag before computing the signature of a commit
- commit: write commits for both hashes
- object-file: add a compat_oid_in parameter to write_object_file_flags
- object-file: update the loose object map when writing loose objects
- loose: compatibilty short name support
- loose: add a mapping between SHA-1 and SHA-256 for loose objects
- repository: add a compatibility hash algorithm
- object-names: support input of oids in any supported hash
- oid-array: teach oid-array to handle multiple kinds of oids
- object-file-convert: stubs for converting from one object format to another
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
Needs review.
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
* jx/remote-archive-over-smart-http (2023-10-04) 4 commits
- archive: support remote archive from stateless transport
- transport-helper: call do_take_over() in connect_helper
- transport-helper: call do_take_over() in process_connect
- transport-helper: no connection restriction in connect_helper
"git archive --remote=<remote>" learned to talk over the smart
http (aka stateless) transport.
Needs review.
source: <cover.1696432593.git.zhiyou.jx@alibaba-inc.com>
* jx/sideband-chomp-newline-fix (2023-10-04) 3 commits
- pkt-line: do not chomp newlines for sideband messages
- pkt-line: memorize sideband fragment in reader
- test-pkt-line: add option parser for unpack-sideband
Sideband demultiplexer fixes.
Needs review.
source: <cover.1696425168.git.zhiyou.jx@alibaba-inc.com>
* js/config-parse (2023-09-21) 5 commits
- config-parse: split library out of config.[c|h]
- config.c: accept config_parse_options in git_config_from_stdin
- config: report config parse errors using cb
- config: split do_event() into start and flush operations
- config: split out config_parse_options
The parsing routines for the configuration files have been split
into a separate file.
Needs review.
source: <cover.1695330852.git.steadmon@google.com>
* jc/fake-lstat (2023-09-15) 1 commit
- cache: add fake_lstat()
(this branch is used by jc/diff-cached-fsmonitor-fix.)
A new helper to let us pretend that we called lstat() when we know
our cache_entry is up-to-date via fsmonitor.
Needs review.
source: <xmqqcyykig1l.fsf@gitster.g>
* js/doc-unit-tests (2023-11-10) 3 commits
(merged to 'next' on 2023-11-10 at 7d00ffd06b)
+ ci: run unit tests in CI
+ unit tests: add TAP unit test framework
+ unit tests: add a project plan document
(this branch is used by js/doc-unit-tests-with-cmake.)
Process to add some form of low-level unit tests has started.
Will cook in 'next'.
source: <cover.1699555664.git.steadmon@google.com>
* js/doc-unit-tests-with-cmake (2023-11-10) 7 commits
(merged to 'next' on 2023-11-10 at b4503c9c8c)
+ cmake: handle also unit tests
+ cmake: use test names instead of full paths
+ cmake: fix typo in variable name
+ artifacts-tar: when including `.dll` files, don't forget the unit-tests
+ unit-tests: do show relative file paths
+ unit-tests: do not mistake `.pdb` files for being executable
+ cmake: also build unit tests
(this branch uses js/doc-unit-tests.)
Update the base topic to work with CMake builds.
Will cook in 'next'.
source: <pull.1579.v3.git.1695640836.gitgitgadget@gmail.com>
* jc/rerere-cleanup (2023-08-25) 4 commits
- rerere: modernize use of empty strbuf
- rerere: try_merge() should use LL_MERGE_ERROR when it means an error
- rerere: fix comment on handle_file() helper
- rerere: simplify check_one_conflict() helper function
Code clean-up.
Not ready to be reviewed yet.
source: <20230824205456.1231371-1-gitster@pobox.com>
* rj/status-bisect-while-rebase (2023-10-16) 1 commit
- status: fix branch shown when not only bisecting
"git status" is taught to show both the branch being bisected and
being rebased when both are in effect at the same time.
Needs review.
source: <2e24ca9b-9c5f-f4df-b9f8-6574a714dfb2@gmail.com>
--------------------------------------------------
[Discarded]
* jc/strbuf-comment-line-char (2023-11-01) 4 commits
. strbuf: move env-using functions to environment.c
. strbuf: make add_lines() public
. strbuf_add_commented_lines(): drop the comment_line_char parameter
. strbuf_commented_addf(): drop the comment_line_char parameter
Code simplification that goes directly against a past libification
topic. It is hard to judge because the "libification" is done
piecewise without seemingly clear design principle.
Will discard.
source: <cover.1698791220.git.jonathantanmy@google.com>
^ permalink raw reply
* Re: [PATCH v4 4/4] rebase: rewrite --(no-)autosquash documentation
From: Junio C Hamano @ 2023-11-13 1:21 UTC (permalink / raw)
To: Andy Koppe; +Cc: git, newren
In-Reply-To: <20231111132720.78877-6-andy.koppe@gmail.com>
Andy Koppe <andy.koppe@gmail.com> writes:
> +In the rebase todo list, the actions of squash, fixup and amend commits are
> +changed from `pick` to `squash`, `fixup` or `fixup -C`, respectively, and they
> +are moved right after the commit they modify. The `--interactive` option can
> +be used to review and edit the todo list before proceeding.
OK, this is good---exactly what I was looking for while reviewing
the "lose -i from the description" step earlier in the series.
Nicely done.
^ permalink raw reply
* Re: [PATCH v4 3/4] rebase: test autosquash with and without -i
From: Junio C Hamano @ 2023-11-13 1:20 UTC (permalink / raw)
To: Andy Koppe; +Cc: git, newren
In-Reply-To: <20231111132720.78877-4-andy.koppe@gmail.com>
Andy Koppe <andy.koppe@gmail.com> writes:
> Amend t3415-rebase-autosquash.sh to test the --autosquash option and
> rebase.autoSquash config with and without -i.
>
> Signed-off-by: Andy Koppe <andy.koppe@gmail.com>
> ---
> t/t3415-rebase-autosquash.sh | 38 ++++++++++++++++++++++++++----------
> 1 file changed, 28 insertions(+), 10 deletions(-)
>
> diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
> index a364530d76..fcc40d6fe1 100755
> --- a/t/t3415-rebase-autosquash.sh
> +++ b/t/t3415-rebase-autosquash.sh
> @@ -43,7 +43,7 @@ test_auto_fixup () {
>
> git tag $1 &&
> test_tick &&
> - git rebase $2 -i HEAD^^^ &&
> + git rebase $2 HEAD^^^ &&
> git log --oneline >actual &&
> if test -n "$no_squash"
> then
> @@ -61,15 +61,24 @@ test_auto_fixup () {
> }
>
> test_expect_success 'auto fixup (option)' '
> - test_auto_fixup final-fixup-option --autosquash
> + test_auto_fixup fixup-option --autosquash &&
> + test_auto_fixup fixup-option-i "--autosquash -i"
> '
Nice. As test_auto_fixup (and test_auto_squash we see later) clears
the slate with "git reset --hard base" before it starts its work, it
is easy to rerun them with and without "-i".
^ permalink raw reply
* Re: [RFC PATCH] status: avoid reporting worktrees as "Untracked files"
From: Junio C Hamano @ 2023-11-12 23:52 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Edmundo Carmona Antoranz, git
In-Reply-To: <CAPig+cQbwcJOQiYyb7bma3pH1hxjE_X_yeAp3JeHWVCeJtySfQ@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
> I doubt you're the only one, but, based upon, list emails over the
> years, it seems that both in-main-tree and outside-main-tree (often
> sibling) worktrees are common. More recently, we've also heard from
> people who don't even have a main-worktree; instead, they hang their
> multiple worktrees off of a bare repository (which is an
> explicitly-supported use-case); i.e.:
>
> git clone --bare https://.../foobar.git
> git -C foobar.git worktree add worktree1
> git -C foobar.git worktree add worktree2
> ...
I am not sure why you brought in that layout in this discussion,
because it places worktree1 and worktree2 next to each other, just
like placing worktree1 and worktree2 next to the non-bare repository.
git clone https://.../foobar.git foobar
git -C foobar worktree add worktree1
git -C foobar worktree add worktree2
The layout to create worktrees attached to a bare repository and add
them next to each other, and the same starting from a non-bare
repository, share an important trait. They do not have an untracked
and untrackable "cruft" in their working tree, unlike the crazy
layout that places worktrees of the repository inside the working
tree of the primary worktree as untracked subdirectories.
Really, what is the advantage of doing so? It is not like the build
recipe recorded in the primary worktree can work recursively on
different branches that are checked out---worktree names and paths
at which they are checked out are totally local matter, and the
upstream project that supplies the build recipe would not know or
care.
Even worse, when the project wants to add a new subdirectory or a
file, the name chosen for the subdirectory may happen to collide
with the name of an untracked subdirectory you happened to have used
(again, because the worktree names and locations are totally local
matter, the upstream project are unaware of them and cannot avoid
such name clashes even if they cared). You can imagine the
confusion that happens to your next "git pull".
Compared to such an insanity, attaching worktrees to a bare
repository, so that all worktrees are equals and there is no
"primary" worktree that you cannot remove, behave just as normal as
a set of worktrees attached to a non-bare repository and sit outside
the primary worktree, often as immediate siblings.
^ permalink raw reply
* Re: first-class conflicts?
From: Junio C Hamano @ 2023-11-12 23:25 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: Sandra Snan, git, Dragan Simic, rsbecker
In-Reply-To: <20231112152143.GD35991@mit.edu>
"Theodore Ts'o" <tytso@mit.edu> writes:
> On Sat, Nov 11, 2023 at 10:31:54AM +0900, Junio C Hamano wrote:
>> ...
>> I wonder if it would help users to add a new configuration option
>> for those who want to live safer that tells "commit -a" to leave
>> unmerged paths alone and require the unmerged paths to be added
>> explicitly (which may have to extend to cover things like "add -u"
>> and "add .").
>>
>> Perhaps not. I often find myself doing "git add -u" after resolving
>> conflicts and re-reading the result, without an explicit pathspec.
>
> Maybe the configuration option would also forbit "git add -u" from
> adding diffs with conflict markers unless --force is added?
Historically we left it to pre-commit hooks, but I agree that
protection at the time of "git add" may be more helpful.
I also alluded to being careful about "git add" with an overly vague
pathspec (like "." to add everything addable under the sun), but I
do not think it is possible to define "overly vague" in a way that
satisfies everybody (would "git add \*.h" be still overly vague when
5% of your header files have conflicts in the merge you are
concluding?) and keep the new users safe.
Unless the configuration forbids patterns and say "each and every
individual path must be named to add and resolve conflicted paths",
that is. Come to think of it, that may not be too bad.
> I dunno. I personally wouldn't use it myself, because I've always
> made a point of running "git diff", or "git status", and almost
> always, a command like "make -j16 && make -j16 check" (or an aliased
> equivalent) before commiting a merge.
>
> But that's because I'm a paranoid s.o.b. and in my long career, I've
> learned is that "you can't be paranoid enough", and "hope is not a
> strategy". :-)
Being careful and paranoid is good ;-) I wouldn't use it myself,
either, but the discussion started while trying to allay new users'
worries about recording a half-resolved state by mistake, and in
that context, I think it would have non-empty audiences.
Thanks.
^ permalink raw reply
* Re: Git Rename Detection Bug
From: Junio C Hamano @ 2023-11-12 23:09 UTC (permalink / raw)
To: Elijah Newren
Cc: Philip Oakley, Jeremy Pridmore, git@vger.kernel.org,
Paul Baumgartner
In-Reply-To: <CABPp-BEtva2WTGQG3Qs4EbZLK_RJC9vuA-2OYxkTPExgowwvqQ@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
>> Could I suggest that we are missing a piece of terminology, to wit,
>> BLOBSAME. It's a compatriot to TREESAME, as used in `git log` for
>> history simplification (based on a tree's pathspec, most commonly a
>> commit's top level path).
>
> We could add it, but I'm not sure how it helps. We already had 'exact
> rename' which seems to fit the bill as well, and 'blob' is something
> someone new to Git is unlikely to know.
Also, as Philip said, TREESAME is a concept foreign to rename
detection codepath. It is a property of a commit (not a tree) and
tells us if it has the same tree object as its relevant parents (in
which case it can be simplified away if it is a merge). I do not
mind rename codepath using a jargon (or two) to express "in trees A
and B, this subtree of A records the same tree object as a subtree
of B at a different path (i.e., the contents of these two subtrees
at different paths are the same)" but the word used to express that
should not be TREESAME to avoid confusion. And the other word to
express "this path in tree A records a blob object that is identical
to this other path in tree B" should not be BLOBSAME, as the word
strongly hints it is somehow related to TREESAME.
Thanks.
^ permalink raw reply
* Re: [PATCH] format-patch: fix ignored encode_email_headers for cover letter
From: René Scharfe @ 2023-11-12 18:38 UTC (permalink / raw)
To: Jeff King; +Cc: git, Junio C Hamano, Simon Ser
In-Reply-To: <20231109183506.GB2711684@coredump.intra.peff.net>
Am 09.11.23 um 19:35 schrieb Jeff King:
> On Thu, Nov 09, 2023 at 11:19:56AM +0000, Simon Ser wrote:
>
>> When writing the cover letter, the encode_email_headers option was
>> ignored. That is, UTF-8 subject lines and email addresses were
>> written out as-is, without any Q-encoding, even if
>> --encode-email-headers was passed on the command line.
>>
>> This is due to encode_email_headers not being copied over from
>> struct rev_info to struct pretty_print_context. Fix that and add
>> a test.
>
> That makes sense, and your patch looks the right thing to do as an
> immediate fix. But I have to wonder:
>
> 1. Are there other bits that need to be copied?
Good question.
> Grepping for other
> code that does the same thing, I see that show_log() and
> cmd_format_patch() copy a lot more.
show_log() copies almost half of the struct 6d167fd7cc members
from struct rev_info!
cmd_format_patch() doesn't seem have a struct pretty_print_context,
though...
> (For that matter, why doesn't
> make_cover_letter() just use the context set up by
> cmd_format_patch()?).
... which answers this question, but did you perhaps mean a different
function?
> 2. Why are we copying this stuff at all? When we introduced the
> pretty-print context back in 6bf139440c (clean up calling
> conventions for pretty.c functions, 2011-05-26), the idea was just
> to keep all of the format options together. But later, 6d167fd7cc
> (pretty: use fmt_output_email_subject(), 2017-03-01) added a
> pointer to the rev_info directly.
Hmm. Was sticking the rev_info pointer in unwise? Does it tangle up
things that should be kept separate? It uses force_in_body_from,
grep_filter, sources, nr, total and subject_prefix from struct rev_info.
That seems a lot, but is just a small fraction of its total members and
we could just copy those we need. Or prepare the subject string and
pass it in, as before 6d167fd7cc.
> So could/should we just be using
> pp->rev->encode_email_headers here?
Perhaps. If we want struct pretty_print_context to be a collection of
named parameters, though, then it makes sense to avoid using
complicated types to provide a nice interface to its callers, and
struct rev_info is one of our largest structs we have.
> Or if that field is not always set (or we want to override some
> elements), should there be a single helper function to initialize
> the pretty_print_context from a rev_info, that could be shared
> between spots like show_log() and make_cover_letter()?
That would help avoid forgetting to copy something. But copying is
questionable in general, as you mentioned. Given the extent of the
overlap, would it make sense to embed struct pretty_print_context in
struct rev_info instead? Or a subset thereof?
René
^ permalink raw reply
* Re: [RFC PATCH] status: avoid reporting worktrees as "Untracked files"
From: Eric Sunshine @ 2023-11-12 17:13 UTC (permalink / raw)
To: Edmundo Carmona Antoranz; +Cc: Junio C Hamano, git
In-Reply-To: <CAOc6etbowajhHsctFJN4ZQ0gND0jzZUrhEkep_pLYtE9y9RBCQ@mail.gmail.com>
On Sat, Nov 11, 2023 at 4:22 AM Edmundo Carmona Antoranz
<eantoranz@gmail.com> wrote:
> On Sat, Nov 4, 2023 at 7:58 AM Junio C Hamano <gitster@pobox.com> wrote:
> > What problem are you trying to solve? "git add foo" where "foo" is
> > actually a different worktree of the repository would add it as a
> > submodule that causes confusion? If that is the case, I think the
> > right solution is not to get into such a state, i.e. not create a
> > worktree of the repository inside a different worktree in the first
> > place.
> >
> Hey, guys! Thanks Junio and Eric for sharing your thoughts.
>
> I am not against the idea of creating worktrees outside of the
> repository... however, I like them to be _inside_ the repository. Am I
> the only one? IDK. I might be! It feels completely natural, if you ask
> me.... but that's just my opinion, I acknowledge that.
I doubt you're the only one, but, based upon, list emails over the
years, it seems that both in-main-tree and outside-main-tree (often
sibling) worktrees are common. More recently, we've also heard from
people who don't even have a main-worktree; instead, they hang their
multiple worktrees off of a bare repository (which is an
explicitly-supported use-case); i.e.:
git clone --bare https://.../foobar.git
git -C foobar.git worktree add worktree1
git -C foobar.git worktree add worktree2
...
^ permalink raw reply
* Re: first-class conflicts?
From: Theodore Ts'o @ 2023-11-12 15:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Sandra Snan, git, Dragan Simic, rsbecker
In-Reply-To: <xmqqh6ltrs6t.fsf@gitster.g>
On Sat, Nov 11, 2023 at 10:31:54AM +0900, Junio C Hamano wrote:
> Correct but with a caveat: it is too easy for lazy folks to
> circumvent the safety by mistake with "commit -a".
>
> I wonder if it would help users to add a new configuration option
> for those who want to live safer that tells "commit -a" to leave
> unmerged paths alone and require the unmerged paths to be added
> explicitly (which may have to extend to cover things like "add -u"
> and "add .").
>
> Perhaps not. I often find myself doing "git add -u" after resolving
> conflicts and re-reading the result, without an explicit pathspec.
Maybe the configuration option would also forbit "git add -u" from
adding diffs with conflict markers unless --force is added?
I dunno. I personally wouldn't use it myself, because I've always
made a point of running "git diff", or "git status", and almost
always, a command like "make -j16 && make -j16 check" (or an aliased
equivalent) before commiting a merge.
But that's because I'm a paranoid s.o.b. and in my long career, I've
learned is that "you can't be paranoid enough", and "hope is not a
strategy". :-)
- Ted
^ permalink raw reply
* Re: Declutter the home directory
From: Dragan Simic @ 2023-11-12 13:39 UTC (permalink / raw)
To: Félix Piédallu; +Cc: git
In-Reply-To: <cb89d863-12d4-412b-a25b-9eedce996708@piedallu.me>
On 2023-11-12 13:10, Félix Piédallu wrote:
> ## Default to XDG paths instead of home directory
>
> It would just swap the priority of the two possible paths. It would
> also only impact new installations as, if ~/.gitconfig exists, it
> would keep being used.
Quite frankly, some configuration files should remain in $HOME, and
~/.gitconfig is IMHO one of those. It's used very frequently, not only
directly, but also while discussing or explaining various configuration
features or issues. Thus, moving it somewhere else would only make
things more complicated and worse.
IOW, I think that the order/priority shouldn't be changed.
^ permalink raw reply
* Declutter the home directory
From: Félix Piédallu @ 2023-11-12 12:10 UTC (permalink / raw)
To: git
Hi,
I'm new on this mailing list so please tell me if the subject was
already discussed.
The Freedesktop XDG Base Directory specification
(https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html)
aims to declutter the home directory by moving files where they should
be more logically located. Here i'll be talking about some directories:
* $XDG_CACHE_HOME, that defaults to the well-known $HOME/.cache
* $XDG_CONFIG_HOME, that defaults to the also well known $HOME/.config
* $XDG_RUNTIME_DIR, that should contain non-essential runtime files
such as socket files
For now 4 kind of files are put in the $HOME directory by git:
* .gitconfig | .config/git/config
it defaults to .gitconfig
* .git-credentials | .config/git/credentials from the credential-store
it also defaults to .git-credentials
* .cache/git/credentials | .git-credential-cache/ from credential-cache
this one defaults to .cache/git/credentials/
* .git-fsmonitor-%s for Darwin file system monitor.
I have 3 propositions:
## Move runtimes files to $XDG_RUNTIME_DIR
* .cache/git/credential/ -> $XDG_RUNTIME_DIR/git/credential/
* .git-fsmonitor-%s -> $XDG_RUNTIME_DIR/git/fsmonitor/%s
Those file shall be deleted at the end of the user session, so this is
the good place to store them.
## Move ~/.config/git/credentials to ~/.cache/git/credentials
Indeed this might contain sensitive information that some users don't
want to be backed up or synchronized.
A possibility would be to read ~/.cache/git/credentials,
~/.config/git/credentials, ~/.git-credentials, and to use the first
existing one.
## Default to XDG paths instead of home directory
It would just swap the priority of the two possible paths. It would also
only impact new installations as, if ~/.gitconfig exists, it would keep
being used.
The goal of those propositions is to declutter the home directory, and
ease the cleanup, backup and synchronisation of user settings.
Thanks for reading me.
Félix Piédallu
^ permalink raw reply
* Re: [PATCH] fuzz: add new oss-fuzz fuzzer for date.c / date.h
From: Junio C Hamano @ 2023-11-12 12:39 UTC (permalink / raw)
To: Arthur Chan via GitGitGadget; +Cc: git, Arthur Chan
In-Reply-To: <xmqqfs1bo6l4.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> As I used the first byte to fuzz dmtype and .local, let's use the
> next three bytes to allow feeding overly wild timezone values to the
> machinery and see what breaks, perhaps like so:
>
> tz = *data++; /* int tz; */
> tz = (tz << 8) | *data++;
> tz = (tz << 8) | *data++;
> size -= 3;
Just this part. As data points at unsigned char, the above would
not give us any negative number. We'd need to sign-extend the
24-bit resulting value if we are going to adopt the above approach.
^ permalink raw reply
* Re: [PATCH] checkout: add config variable checkout.autoDetach
From: Andy Koppe @ 2023-11-12 9:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, pclouds
In-Reply-To: <xmqqbkbzo6ba.fsf@gitster.g>
On 12/11/2023 06:04, Junio C Hamano wrote:
> Andy Koppe <andy.koppe@gmail.com> writes:
>
>> The git-checkout command without pathspecs automatically detaches HEAD
>> when switching to something other than a branch, whereas git-switch
>> requires the --detach option to do so.
>>
>> Add configuration variable checkout.autoDetach to choose the behavior
>> for both: true for automatic detaching, false for requiring --detach.
>>
>> Amend their documentation and tests accordingly.
>>
>> Signed-off-by: Andy Koppe <andy.koppe@gmail.com>
>> ---
>
> "switch" was meant to be an experimental command to sort out this
> kind of UI ideas, and I think the fact that it requires a more
> explicit "--detach", where experienced users might just say "git
> checkout that-branch^0", has established itself as a more friendly
> and good thing to help new users.
I agree, but as an experienced user, I nevertheless prefer switch and
restore over checkout, because those are rather different tasks, and
with checkout you're only ever a small thinko and errant dot away from
losing your local changes. If switch and restore had existed first, I
don't think anyone would be asking for mashing them together.
Incidentally, as reset is similarly overloaded, and restore can also
replace the forms of reset that take pathspec arguments, was there a
similar plan to factor the head-moving forms of reset out into a
separate command? (I realise there'd be little appetite for that after
the switch/restore experiment.)
> I do not know how others react to
> this kind of proliferation of configuration variables, but I do not
> mind this particular variable existing.
Thanks. There's also the checkout.guess variable as a closely related
precedent.
Regards,
Andy
^ permalink raw reply
* Re: first-class conflicts?
From: Martin von Zweigbergk @ 2023-11-12 7:05 UTC (permalink / raw)
To: Elijah Newren; +Cc: phillip.wood, Sandra Snan, git, Randall S. Becker
In-Reply-To: <CABPp-BF35JvbXcjLxJkQtKeVhQ2qYaBXBoN4P07BEWS8mxTaMA@mail.gmail.com>
On Fri, Nov 10, 2023 at 1:41 PM Elijah Newren <newren@gmail.com> wrote:
>
> Hi Martin,
>
> On Wed, Nov 8, 2023 at 10:23 AM Martin von Zweigbergk
> <martinvonz@google.com> wrote:
> > On Tue, Nov 7, 2023 at 11:31 PM Elijah Newren <newren@gmail.com> wrote:
> > > On Tue, Nov 7, 2023 at 9:38 AM Martin von Zweigbergk
> > > <martinvonz@google.com> wrote:
> > > >
> [...]
> > > I am curious more about the data you do store. My fuzzy memory is
> > > that you store a commit header involving something of the form "A + B
> > > - C", where those are all commit IDs. Is that correct?
> >
> > We actually store it outside the Git repo (together with the "change
> > id"). We have avoided using commit headers because I wasn't sure how
> > well different tools deal with unexpected commit headers, and because
> > I wanted commits to be indistinguishable from commits created by a
> > regular Git binary. The latter argument doesn't apply to commits with
> > conflicts since those are clearly not from a regular Git binary
> > anyway, and we don't allow pushing them to a remote.
> >
> > > Is this in
> > > addition to a normal "tree" header as in Git, or are one of A or B
> > > found in the tree header?
> >
> > It's in addition. For the tree, we actually write a tree object with
> > three subtrees:
> >
> > .jjconflict-base-0: C
> > .jjconflict-side-0: A
> > .jjconflict-side-1: B
> >
> > The tree is not authoritative - we use the Git-external storage for
> > that. The reason we write the trees is mostly to prevent them from
> > getting GC'd.
>
> Oh, that seems like a clever way to handle reachability and make sure
> the relevant trees are automatically included in any pushes or pulls.
>
> > Also, if a user does `git checkout <conflicted commit>`,
> > they'll see those subdirectories and will hopefully be reminded that
> > they did something odd (perhaps we should drop the leading `.` so `ls`
> > will show them...). They can also diff the directories in a diff tool
> > if they like.
>
> Oh, so they don't get a regular top-level looking tree with
> possibly-conflicted-files present? Or is this in addition to the
> regular repository contents?
They get a regular tree with conflict markers if they use `jj
checkout`, but not if they use `git checkout`.
> If in addition, are you worried about
> users ever creating real entries named ".jjconflict-base-<N>" in their
> repository?
I'm not worried about that since it's not the source of truth, so at
most they waste some time.
By the way, if the user did use `git checkout` and got those
`.jjconflict-*` directories in the working copy, and then ran a `jj`
command afterwards, then jj would think that the conflict was resolved
by replacing the conflicted paths (and all other paths!) by those
`.jjconflict-*` directories :) The user would probably realize their
mistake pretty quickly and run `jj abandon` to discard those changes.
>
> > > I think you said there was also the
> > > possibility for more than three terms. Are those for when a
> > > conflicted commit is merged with another branch that adds more
> > > conflicts, or are there other cases too? (Octopus merges?)
> >
> > Yes, they can happen in both of those cases you mention. More
> > generally, whenever you apply a diff between two trees onto another
> > tree, you might end up with a higher-arity conflict. So merging in
> > another branch can do that, or doing an octopus merge (which is the
> > same thing at the tree level, just different at the commit level), or
> > rebasing or reverting a commit.
> >
> > We simplify conflicts algebraically, so rebasing a commit multiple
> > times does not increase the arity - the intermediate parents were both
> > added and removed and thus cancel out. These simple algorithms for
> > simplifying conflicts are encapsulated in
> > https://github.com/martinvonz/jj/blob/main/lib/src/merge.rs. Most of
> > them are independent of the type of values being merged; they can be
> > used for doing algebra on tree ids, content hunks, refs, etc. (in the
> > test cases, we mostly merge integers because integer literals are
> > compact).
>
> It's done on content hunks as well? That's interesting.
Yes, when merging trees, we start at the root tree and try to resolve
conflicts at the tree entry level (i.e. without reading file
contents). I think git does the same. If that's not enough we need to
recurse into subtrees or file contents. When merging files, we find
matching regions of the inputs and use the same algorithm on the
individual chunks between the matching regions.
>
> When exactly would it be done on refs, though? I'm not following that one.
First of all, note that jj allows refs to be in a conflicted state
similar to how trees can be in a conflicted state. We merge refs for a
few different reasons. If you run two concurrent operations on a repo,
we merge any changes to the refs. We do the same thing when you fetch
branches from a remote. For example, if you've fetched branch "main"
from a remote, then moved it locally, and then you fetch again from
the remote, we'll attempt to merge those refs. We use the same
function for merging there, but if it fails, we then also
automatically resolve two operations moving the branch forward
different amounts (e.g. one operation moves a ref from X~10 to X~5
while the other moves it forward to X, we resolve to X).
https://github.com/martinvonz/jj/blob/main/docs/technical/concurrency.md
talks a bit more about that.
>
> And what else is in that "etc."?
I think it's only individual file ids (blob ids) and the executable
bit. If a file's content changed and its executable bit changed, we
use the same algorithm for each of those pieces of information.
>
> > > What about recursive merges, i.e. merges where the two sides do not
> > > have a unique merge base. What is the form of those? (Would "- C" be
> > > replaced by "- C1 - C2 - ... - Cn"? Or would we create the virtual
> > > merge base V and then do a " - V"? Or do we only have "A + B"?)
> >
> > We do that by recursively creating a virtual tree just like Git does,
> > I think (https://github.com/martinvonz/jj/blob/084b99e1e2c42c40f2d52038cdc97687b76fed89/lib/src/rewrite.rs#L56-L71).
> > I think the main difference is that by modeling conflicts, we can
> > avoid recursive conflict markers (if that's what Git does), and we can
> > even automatically resolve some cases where the virtual tree has a
> > conflict.
>
> Okay, but that talks about the mechanics of creating a recursive
> merge, omitting all the details about how the conflict header is
> written when you record the merge. Is the virtual merge base
> represented in the algebraic "A + B - C" expressions, or is the "- C"
> part omitted? If it is represented, and the virtual merge base had
> conflicts which you could not automatically resolve, what exactly does
> the conflicted header for the outer merge get populated with?
I think we're talking about the state in F below, right?
F
/ \
/ \
D E
|\ /|
| X |
|/ \|
B C
\ /
\ /
A
The virtual commit/tree, which we can think of as sitting where the X
is in the graph, would have state V=B+C-A. The state at F would have
D+E-V=D+E-(B+C-A)=D+(E-C)+(A-B). This is encoded in `Merge::flatten()`
here: https://github.com/martinvonz/jj/blob/e3a1e5b80ed9124091baa4d920cc9e8124c1f559/lib/src/merge.rs#L421-L451.
It's not specific to recursive merge; we run into the same kind of
higher-arity conflicts on regular octopus merges or repeated merges
(if you don't resolve conflicts in between).
Oh, I should also say that we don't store the unmodified trees in
these expressions. Instead, for anything we can automatically resolve,
we replace those parts of the trees. So even if A, B, and C differ at
paths X, Y, and Z, the trees we associate with V might only differ at
path Y if that's the only path we couldn't resolve. IIRC, I did it
that way because it seemed wasteful to re-attempt the merge at paths X
and Z every time we rewrite the commit. I *think* it rarely matters in
practice, but it feels like it could in some cases (maybe where two
sides make the same changes).
>
> [...]
>
> > Great questions! We don't have support for renames, so we haven't had
> > to worry about these things. We have talked a little about divergent
> > renames and the need for recording that in the commit so we can tell
> > the user about it and maybe ask them which name they want to keep. I
> > had not considered the interaction with partial conflict resolution,
> > so thanks for bringing that up. I don't have any answers now, but
> > we'll probably need to start thinking about this soon.
>
> I was wondering if that might be the answer. When you do tackle this,
> I'd be interested to hear your thoughts. I'm wondering if we just
> need to augment the data in the conflict header to handle such cases
> (though I guess this could risk having commit objects that are
> significantly bigger than normal in theoretical cases where many such
> paths are involved?)
Yes, that's what I've been thinking, but I think the only thing I had
been thinking of storing was for "divergent renames" (A->B on one
side, A->C on the other). Will let you know when we start thinking
about this for real. Thanks again for your input!
>
> > > I'm curious to hear what happens when you do start dogfooding, on
> > > projects with many developers and which are jj-only. Do commits with
> > > conflicts accidentally end up in mainline branches, or are there good
> > > ways to make sure they don't hit anything considered stable?
> >
> > That won't happen at Google because our source of truth for "merged
> > PRs" (in GitHub-speak) is in our existing VCS. We will necessarily
> > have to translate from jj's data model to its data model before a
> > commit can even be sent for review.
>
> That makes sense, but I was just hoping we'd have an example to look
> to for how to keep things safe if we were to implement this. Sadly, I
> don't think we have the benefit of relying on folks to first push
> their commits into some other VCS which lacks this feature. ;-)
It might be best to disallow pushing conflicts to start with. It
should also be easy to add a hook on the server to disallow it only to
certain branches.
^ permalink raw reply
* Re: [PATCH] checkout: add config variable checkout.autoDetach
From: Junio C Hamano @ 2023-11-12 6:04 UTC (permalink / raw)
To: Andy Koppe; +Cc: git, pclouds
In-Reply-To: <20231111224253.1923-1-andy.koppe@gmail.com>
Andy Koppe <andy.koppe@gmail.com> writes:
> The git-checkout command without pathspecs automatically detaches HEAD
> when switching to something other than a branch, whereas git-switch
> requires the --detach option to do so.
>
> Add configuration variable checkout.autoDetach to choose the behavior
> for both: true for automatic detaching, false for requiring --detach.
>
> Amend their documentation and tests accordingly.
>
> Signed-off-by: Andy Koppe <andy.koppe@gmail.com>
> ---
"switch" was meant to be an experimental command to sort out this
kind of UI ideas, and I think the fact that it requires a more
explicit "--detach", where experienced users might just say "git
checkout that-branch^0", has established itself as a more friendly
and good thing to help new users. I do not know how others react to
this kind of proliferation of configuration variables, but I do not
mind this particular variable existing.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox