Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 14 5月, 2011 17 次提交
  3. 13 5月, 2011 2 次提交
  5. 12 5月, 2011 9 次提交
  7. 10 5月, 2011 1 次提交
    • J
      t1507: avoid "${parameter<op>'word'}" inside double-quotes · 365c2aaa
      由 Junio C Hamano 提交于 
      Kacper Kornet noticed that a $variable in "word" in the above construct is
not substituted by his pdksh.  Modern POSIX compliant shells (e.g. dash,
ksh, bash) all seem to interpret POSIX "2.6.2 Parameter Expansion" that
says "word shall be subjected to tilde expansion, parameter expansion,
command substitution, and arithmetic expansion" in ${parameter<op>word},
to mean that the word is expanded as if it appeared in dq pairs, so if the
word were "'$variable'" (sans dq) it would expand to a single quote, the
value of the $variable and then a single quote.

Johannes Sixt reports that the behavior of quoting at the right of :- when
the ${...:-...} expansion appears in double-quotes was debated recently at
length at the Austin group.  We can avoid this issue and future-proof the
test by a slight rewrite.
Helped-by: NJohannes Sixt <j.sixt@viscovery.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      365c2aaa
  9. 09 5月, 2011 4 次提交
  11. 07 5月, 2011 7 次提交
    • J
      tests: teach verify_parents to check for extra parents · 3fc0dbf0
      由 Jonathan Nieder 提交于 
      Currently verify_parents only makes sure that the earlier parents of
HEAD match the commits given, and does not care if there are more
parents.  This makes it harder than one would like to check that, for
example, parent reduction works correctly when making an octopus.

Fix it by checking that HEAD^(n+1) is not a valid commit name.
Noticed while working on a new test that was supposed to create a
fast-forward one commit ahead but actually created a merge.
Reported-by: NJunio C Hamano <gitster@pobox.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3fc0dbf0
    • J
      merge: make branch.<name>.mergeoptions correctly override merge.<option> · 0d8fc3ef
      由 Junio C Hamano 提交于 
      The parsing of the additional command line parameters supplied to
the branch.<name>.mergeoptions configuration variable was implemented
at the wrong stage.  If any merge-related variable came after we read
branch.<name>.mergeoptions, the earlier value was overwritten.

We should first read all the merge.* configuration, override them by
reading from branch.<name>.mergeoptions and then finally read from
the command line.

This patch should fix it, even though I now strongly suspect that
branch.<name>.mergeoptions that gives a single command line that
needs to be parsed was likely to be an ill-conceived idea to begin
with.  Sigh...
Helped-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      0d8fc3ef
    • J
      tests: eliminate unnecessary setup test assertions · 73151df0
      由 Jonathan Nieder 提交于 
      Most of git's tests write files and define shell functions and
variables that will last throughout a test script at the top of
the script, before all test assertions:

	. ./test-lib.sh

	VAR='some value'
	export VAR

	>empty

	fn () {
		do something
	}

	test_expect_success 'setup' '
		... nontrivial commands go here ...
	'

Two scripts use a different style with this kind of trivial code
enclosed by a test assertion; fix them.  The usual style is easier to
read since there is less indentation to keep track of and no need to
worry about nested quotes; and on the other hand, because the commands
in question are trivial, it should not make the test suite any worse
at catching future bugs in git.

While at it, make some other small tweaks:

 - spell function definitions with a space before () for consistency
   with other scripts;

 - use the self-contained command "git mktree </dev/null" in
   preference to "git write-tree" which looks at the index when
   writing an empty tree.
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      73151df0
    • J
      Update draft release notes to 1.7.6 · 4e3aa87d
      由 Junio C Hamano 提交于 
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      4e3aa87d
    • J
      Merge branch 'jn/run-command-error-failure' · 3970fc55
      由 Junio C Hamano 提交于 
      * jn/run-command-error-failure:
  run-command: handle short writes and EINTR in die_child
  tests: check error message from run_command
      3970fc55
    • J
      Merge branch 'js/info-man-path' · 606ee4be
      由 Junio C Hamano 提交于 
      * js/info-man-path:
  Documentation: clarify meaning of --html-path, --man-path, and --info-path
  git: add --info-path and --man-path options

Conflicts:
	Makefile
      606ee4be
    • J
      Merge branch 'im/hashcmp-optim' · efa67bfd
      由 Junio C Hamano 提交于 
      * im/hashcmp-optim:
  hashcmp(): inline memcmp() by hand to optimize
      efa67bfd