Skip to content

Commit 3104153

Browse files
jiangxinjiangxin
committed
Merge remote-tracking branch 'github/master' into git-po-master
* github/master: (42 commits) Git 2.30-rc1 git-gui: use gray background for inactive text widgets Another batch before 2.30-rc1 git-gui: Fix selected text colors Makefile: conditionally include GIT-VERSION-FILE git-gui: fix colored label backgrounds when using themed widgets config.mak.uname: remove old NonStop compatibility settings diff: correct interaction between --exit-code and -I<pattern> t/perf: fix test_export() failure with BSD `sed` style: do not "break" in switch() after "return" compat-util: pretend that stub setitimer() always succeeds strmap: make callers of strmap_remove() to call it in void context doc: mention Python 3.x supports index-format.txt: document v2 format of file system monitor extension docs: multi-pack-index: remove note about future 'verify' work init: provide useful advice about init.defaultBranch get_default_branch_name(): prepare for showing some advice branch -m: allow renaming a yet-unborn branch init: document `init.defaultBranch` better t7900: use --fixed-value in git-maintenance tests ...
2 parents da5bf7b + 6d3ef5b commit 3104153

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2296
-1928
lines changed

‎Documentation/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ install-html: html
272272
../GIT-VERSION-FILE: FORCE
273273
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
274274

275+
ifneq ($(MAKECMDGOALS),clean)
275276
-include ../GIT-VERSION-FILE
277+
endif
276278

277279
#
278280
# Determine "include::" file references in asciidoc files.
@@ -286,7 +288,9 @@ doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt) build-doc
286288
$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
287289
mv $@+ $@
288290

291+
ifneq ($(MAKECMDGOALS),clean)
289292
-include doc.dep
293+
endif
290294

291295
cmds_txt = cmds-ancillaryinterrogators.txt \
292296
cmds-ancillarymanipulators.txt \

‎Documentation/RelNotes/2.30.0.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,3 +391,9 @@ Fixes since v2.29
391391
(merge 08e9df2395 jk/multi-line-indent-style-fix later to maint).
392392
(merge e66590348a da/vs-build-iconv-fix later to maint).
393393
(merge 7fe07275be js/cmake-extra-built-ins-fix later to maint).
394+
(merge 633eebe142 jb/midx-doc-update later to maint).
395+
(merge 5885367e8f jh/index-v2-doc-on-fsmn later to maint).
396+
(merge 14639a4779 jc/compat-util-setitimer-fix later to maint).
397+
(merge 56f56ac50b ab/unreachable-break later to maint).
398+
(merge 731d578b4f rb/nonstop-config-mak-uname-update later to maint).
399+
(merge f4698738f9 es/perf-export-fix later to maint).

‎Documentation/git-init.txt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ DESCRIPTION
2020

2121
This command creates an empty Git repository - basically a `.git`
2222
directory with subdirectories for `objects`, `refs/heads`,
23-
`refs/tags`, and template files. An initial `HEAD` file that
24-
references the HEAD of the master branch is also created.
23+
`refs/tags`, and template files. An initial branch without any
24+
commits will be created (see the `--initial-branch` option below
25+
for its name).
2526

2627
If the `$GIT_DIR` environment variable is set then it specifies a path
2728
to use instead of `./.git` for the base of the repository.
@@ -73,8 +74,10 @@ If this is reinitialization, the repository will be moved to the specified path.
7374
-b <branch-name>::
7475
--initial-branch=<branch-name>::
7576

76-
Use the specified name for the initial branch in the newly created repository.
77-
If not specified, fall back to the default name: `master`.
77+
Use the specified name for the initial branch in the newly created
78+
repository. If not specified, fall back to the default name (currently
79+
`master`, but this is subject to change in the future; the name can be
80+
customized via the `init.defaultBranch` configuration variable).
7881

7982
--shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
8083

‎Documentation/technical/index-format.txt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,18 @@ The remaining data of each directory block is grouped by type:
306306

307307
The extension starts with
308308

309-
- 32-bit version number: the current supported version is 1.
309+
- 32-bit version number: the current supported versions are 1 and 2.
310310

311-
- 64-bit time: the extension data reflects all changes through the given
311+
- (Version 1)
312+
64-bit time: the extension data reflects all changes through the given
312313
time which is stored as the nanoseconds elapsed since midnight,
313314
January 1, 1970.
314315

316+
- (Version 2)
317+
A null terminated string: an opaque token defined by the file system
318+
monitor application. The extension data reflects all changes relative
319+
to that token.
320+
315321
- 32-bit bitmap size: the size of the CE_FSMONITOR_VALID bitmap.
316322

317323
- An ewah bitmap, the n-th bit indicates whether the n-th index entry

‎Documentation/technical/multi-pack-index.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ Design Details
6060
Future Work
6161
-----------
6262

63-
- Add a 'verify' subcommand to the 'git midx' builtin to verify the
64-
contents of the multi-pack-index file match the offsets listed in
65-
the corresponding pack-indexes.
66-
6763
- The multi-pack-index allows many packfiles, especially in a context
6864
where repacking is expensive (such as a very large repo), or
6965
unexpected maintenance time is unacceptable (such as a high-demand

‎GIT-VERSION-GEN‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.30.0-rc0
4+
DEF_VER=v2.30.0-rc1
55

66
LF='
77
'

‎INSTALL‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ Issues of note:
165165
use English. Under autoconf the configure script will do this
166166
automatically if it can't find libintl on the system.
167167

168-
- Python version 2.4 or later (but not 3.x, which is not
169-
supported by Perforce) is needed to use the git-p4 interface
168+
- Python version 2.7 or later is needed to use the git-p4 interface
170169
to Perforce.
171170

172171
- Some platform specific issues are dealt with Makefile rules,

‎Makefile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ all::
303303
# modules, instead of the fallbacks shipped with Git.
304304
#
305305
# Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
306-
# but /usr/bin/python2.7 on some platforms).
306+
# but /usr/bin/python2.7 or /usr/bin/python3 on some platforms).
307307
#
308308
# Define NO_PYTHON if you do not want Python scripts or libraries at all.
309309
#
@@ -3062,9 +3062,9 @@ GIT_TARNAME = git-$(GIT_VERSION)
30623062
GIT_ARCHIVE_EXTRA_FILES = \
30633063
--prefix=$(GIT_TARNAME)/ \
30643064
--add-file=configure \
3065-
--add-file=$(GIT_TARNAME)/version \
3065+
--add-file=.dist-tmp-dir/version \
30663066
--prefix=$(GIT_TARNAME)/git-gui/ \
3067-
--add-file=$(GIT_TARNAME)/git-gui/version
3067+
--add-file=.dist-tmp-dir/git-gui/version
30683068
ifdef DC_SHA1_SUBMODULE
30693069
GIT_ARCHIVE_EXTRA_FILES += \
30703070
--prefix=$(GIT_TARNAME)/sha1collisiondetection/ \
@@ -3076,13 +3076,14 @@ GIT_ARCHIVE_EXTRA_FILES += \
30763076
--add-file=sha1collisiondetection/lib/ubc_check.h
30773077
endif
30783078
dist: git-archive$(X) configure
3079-
@mkdir -p $(GIT_TARNAME)
3080-
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
3081-
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
3079+
@$(RM) -r .dist-tmp-dir
3080+
@mkdir .dist-tmp-dir
3081+
@echo $(GIT_VERSION) > .dist-tmp-dir/version
3082+
@$(MAKE) -C git-gui TARDIR=../.dist-tmp-dir/git-gui dist-version
30823083
./git-archive --format=tar \
30833084
$(GIT_ARCHIVE_EXTRA_FILES) \
30843085
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
3085-
@$(RM) -r $(GIT_TARNAME)
3086+
@$(RM) -r .dist-tmp-dir
30863087
gzip -f -9 $(GIT_TARNAME).tar
30873088

30883089
rpm::
@@ -3159,8 +3160,8 @@ clean: profile-clean coverage-clean cocciclean
31593160
$(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
31603161
$(RM) -r po/build/
31613162
$(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope*
3162-
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
3163-
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
3163+
$(RM) -r .dist-tmp-dir .doc-tmp-dir
3164+
$(RM) $(GIT_TARNAME).tar.gz
31643165
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
31653166
$(MAKE) -C Documentation/ clean
31663167
$(RM) Documentation/GIT-EXCLUDED-PROGRAMS

‎apply.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3948,10 +3948,8 @@ static int check_patch(struct apply_state *state, struct patch *patch)
39483948
break; /* happy */
39493949
case EXISTS_IN_INDEX:
39503950
return error(_("%s: already exists in index"), new_name);
3951-
break;
39523951
case EXISTS_IN_INDEX_AS_ITA:
39533952
return error(_("%s: does not match index"), new_name);
3954-
break;
39553953
case EXISTS_IN_WORKTREE:
39563954
return error(_("%s: already exists in working directory"),
39573955
new_name);

‎builtin/branch.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
538538
strbuf_addf(&logmsg, "Branch: renamed %s to %s",
539539
oldref.buf, newref.buf);
540540

541-
if (!copy && rename_ref(oldref.buf, newref.buf, logmsg.buf))
541+
if (!copy &&
542+
(!head || strcmp(oldname, head) || !is_null_oid(&head_oid)) &&
543+
rename_ref(oldref.buf, newref.buf, logmsg.buf))
542544
die(_("Branch rename failed"));
543545
if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf))
544546
die(_("Branch copy failed"));

0 commit comments

Comments
 (0)