How to reduce remaining differences to 4msysgit? (was What's cooking in git.git (topics))
From: Steffen Prohaska <hidden>
Date: 2016-06-15 22:44:51
On Jun 30, 2008, at 11:08 AM, Junio C Hamano wrote:
* MinGW will be in.
If this is done, we should be able to create the msysgit release
directly
from Junio's master. Hannes changes alone, however, are not sufficient,
because some commits have been parked in 4msysgit. Now that MinGW is
on Junio's next and Junio's next is also on 4msysgit's next, it it easy
to see how much is left to do by running:
git diff --stat junio/next..4msysgit/next
junio is a remote pointing to git://git.kernel.org/pub/scm/git/git.git.
4msysgit is a remote pointing to git://repo.or.cz/git/mingw/
4msysgit.git.
I attached the output below.
How should we proceed to get rid of the differences?
Should we prepare and send patches directly to the official git list
now?
Should we wait until the first MinGW branch is on master?
Should we prepare a whole patch series? Maybe Hannes would maintain
this
patch series.
I have not yet looked at the remaining differences in detail. I expect
most of them to be trivial. But some might require discussion on the
list, so at some point we should send the patches to the official list.
Steffen
$ git diff --stat junio/next..4msysgit/next
Makefile | 23 ++-
README.MinGW | 77 ++++++++
RelNotes | 1 -
builtin-fetch-pack.c | 3 +-
builtin-tag.c | 14 ++
builtin-verify-tag.c | 2 +
cache.h | 2 +
check-builtins.sh | 2 +-
compat/mingw.c | 4 +-
compat/winansi.c | 309 +++++++++++++++++++++++
+++++++++
connect.c | 5 +-
convert.c | 4 +
fast-import.c | 2 +
git-add--interactive.perl | 2 +-
git-compat-util.h | 7 +
git-parse-remote.sh | 3 +-
gitk-git/Makefile | 4 +
gitk-git/gitk | 2 +
help.c | 30 +++-
path.c | 13 ++
read-cache.c | 5 +
setup.c | 7 +-
t/t0000-basic.sh | 31 +++-
t/t0001-init.sh | 2 +-
t/t0004-unwritable.sh | 7 +
t/t1002-read-tree-m-u-2way.sh | 6 +
t/t1003-read-tree-prefix.sh | 4 +
t/t1004-read-tree-m-u-wf.sh | 2 +
t/t1300-repo-config.sh | 1 +
t/t1301-shared-repo.sh | 4 +
t/t2001-checkout-cache-clash.sh | 2 +
t/t2003-checkout-cache-mkdir.sh | 4 +
t/t2004-checkout-cache-temp.sh | 2 +
t/t2007-checkout-symlink.sh | 7 +
t/t2100-update-cache-badpath.sh | 2 +
t/t2201-add-update-typechange.sh | 11 +-
t/t3000-ls-files-others.sh | 1 +
t/t3010-ls-files-killed-modified.sh | 7 +
t/t3100-ls-tree-restrict.sh | 12 ++
t/t3200-branch.sh | 2 +
t/t3700-add.sh | 10 +
t/t3901-i18n-patch.sh | 4 +
t/t3903-stash.sh | 12 +-
t/t4004-diff-rename-symlink.sh | 7 +
t/t4008-diff-break-rewrite.sh | 4 +
t/t4011-diff-symlink.sh | 7 +
t/t4023-diff-rename-typechange.sh | 5 +
t/t4109-apply-multifrag.sh | 4 +
t/t4110-apply-scan.sh | 4 +
t/t4114-apply-typechange.sh | 5 +
t/t4115-apply-symlink.sh | 7 +
t/t4116-apply-reverse.sh | 3 +-
t/t4122-apply-symlink-inside.sh | 7 +
t/t4150-am.sh | 6 +-
t/t5000-tar-tree.sh | 7 +
t/t5300-pack-object.sh | 62 +++----
t/t5502-quickfetch.sh | 3 +
t/t5503-tagfollow.sh | 25 +++-
t/t5505-remote.sh | 3 +
t/t5511-refspec.sh | 11 +-
t/t5512-ls-remote.sh | 3 +
t/t5520-pull.sh | 1 +
t/t5530-upload-pack-error.sh | 1 +
t/t7004-tag.sh | 5 +-
t/t7005-editor.sh | 1 +
t/t7201-co.sh | 6 +-
t/t7401-submodule-summary.sh | 30 ++--
t/t7501-commit.sh | 1 +
t/t7502-status.sh | 4 +
t/t7503-pre-commit-hook.sh | 6 +
t/t7504-commit-msg-hook.sh | 6 +
t/t9001-send-email.sh | 4 +
t/t9200-git-cvsexportcommit.sh | 4 +
t/t9500-gitweb-standalone-no-errors.sh | 3 +
t/test-lib.sh | 17 ++
templates/Makefile | 3 +
utf8.c | 7 +
utf8.h | 4 -
78 files changed, 844 insertions(+), 86 deletions(-)