mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hn/reftable' into pu

Browse Source 
A new refs backend "reftable" to replace the traditional
combination of packed-refs files and one-file-per-ref loose refs
has been implemented and integrated for improved performance and
atomicity.

* hn/reftable:
  SQUASH??? whitespace breakage fix
  Add "test-tool dump-reftable" command.
  Add reftable testing infrastructure
  vcxproj: adjust for the reftable changes
  Add GIT_DEBUG_REFS debugging mechanism
  Hookup unittests for the reftable library.
  Reftable support for git-core
  Add reftable library
  Add .gitattributes for the reftable/ directory
  Iterate over the "refs/" namespace in for_each_[raw]ref
  Move REF_LOG_ONLY to refs-internal.h
  Treat REVERT_HEAD as a pseudo ref
  Treat CHERRY_PICK_HEAD as a pseudo ref
  Treat BISECT_HEAD as a pseudo ref
  Make refs_ref_exists public
  Write pseudorefs through ref backends.
  checkout: add '\n' to reflog message
  lib-t6000.sh: write tag using git-update-ref
This commit is contained in:
Junio C Hamano
2020-06-19 14:52:46 -07:00
parent f22be25060 6c5b2123af
commit 7166c9eae1
85 changed files with 12629 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
builtin/commit.c
View File

@ -847,21 +847,25 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
!merge_contains_scissors)
wt_status_add_cut_line(s->fp);
status_printf_ln(s, GIT_COLOR_NORMAL,
whence == FROM_MERGE
? _("\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please remove the file\n"
" %s\n"
"and try again.\n")
: _("\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please remove the file\n"
" %s\n"
"and try again.\n"),
whence == FROM_MERGE ?
git_path_merge_head(the_repository) :
git_path_cherry_pick_head(the_repository));
if (whence == FROM_MERGE)
status_printf_ln(
s, GIT_COLOR_NORMAL,
_("\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please remove the file\n"
" %s\n"
"and try again.\n"),
git_path_merge_head(the_repository));
else
status_printf_ln(
s, GIT_COLOR_NORMAL,
_("\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please run\n"
" git cherry-pick --abort\n"
"and try again.\n"));
}
fprintf(s->fp, "\n");