Re: [PATCH 00/15] Use test_config

[Yann Droneaud]

Hi,

Le 27.03.2013 16:05, Junio C Hamano a écrit :

Yann Droneaud ydrone...@opteya.com writes:


Tested against master, 7b592fadf1e23b10b913e0771b9f711770597266


Is this because I suggested you to clean things up while you were
touching in a vicinity of something that could use this clean-up?



Yes, grep'ing shows others usage of the test_config pattern. I patched 
them all.



If so, please first clean _that_ script in a patch, and then add the
change you wanted to do in another patch, as a single two-patch
series, without touching anything else that is not related to that
change.  The patch to t7600 is the one that needs to become two
patches, one to clean up and the other to add tests for --no-ff.



Actually the initial patch adding test for --no-ff-only is not part of 
this series.



Patch against t7600 has a special note about a strange behavor found 
while testing
test_config anyware, that's why there's somes line added to the test 
and a note

in the commit message.

I was waiting for your opinion on this change in the test, but more, on 
the difference

of behavior exhibited in the patched test merge log message:

  git merge --no-log
  git show -s --pretty=format:%b HEAD

vs

  git merge --no-ff --no-log
  git show -s --pretty=format:%b HEAD


First produce an empty file, while the second produce an empty line.

This was revealed by changing test merge c0 with c1 (ff overrides 
no-ff)

-git config branch.master.mergeoptions --no-ff 
-test_config branch.master.mergeoptions --no-ff 


I could split this patch in a first patch that add the behavor test to 
merge log message test,

than I could rebase the patch series against.
And later, submit my proposition for new tests in t7600 regarding 
--no-ff-only and tags.



The rest, as a separate only cleaning up, doing nothing else
series, are fine as a follow-up, but please make sure that they do
not touch anything in-flight (one easy way to check is to see git
diff --name-only maint pu -- t/).  I would prefer to see clean-up
only changes that introduce unnecessary conflicts with other real
features and fixes held off until the dust settles.



It's a good advice that fit perfectly in 
Documentation/SubmittingPatches.


Regards.

--
Yann Droneaud
OPTEYA

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 00/15] Use test_config

[Yann Droneaud]

Please find some patches to use test_config/test_unconfig

Instead of using construct such as:
   test_when_finished git config --unset key
   git config key value
uses
   test_config key value
The latter takes care of removing key at the end of the test.

Additionally, instead of
   git config key 
or
   git config --unset key
 uses
   test_unconfig key
The latter doesn't failed if key is not defined.

Patch t7600: use test_config to set/unset git config variables
is more important than the other and must be carefully reviewed
regarded to the --no-log --no-ff behavior.

Others patches are fairly simple.

Testsuite results are the same after the patches.
Tested against master, 7b592fadf1e23b10b913e0771b9f711770597266

Yann Droneaud (15):
  t4018: remove test_config implementation
  t7810: remove test_config implementation
  t7811: remove test_config implementation
  t3400: use test_config to set/unset git config variables
  t4304: use test_config to set/unset git config variables
  t4034: use test_config/test_unconfig to set/unset git config
variables
  t4202: use test_config/test_unconfig to set/unset git config
variables
  t5520: use test_config to set/unset git config variables
  t5541: use test_config to set/unset git config variables
  t7500: use test_config to set/unset git config variables
  t7502: use test_config to set/unset git config variables
  t7508: use test_config to set/unset git config variables
  t7600: use test_config to set/unset git config variables
  t9500: use test_config to set/unset git config variables
  t7502: remove clear_config

 t/t3400-rebase.sh  |  3 +-
 t/t3404-rebase-interactive.sh  |  3 +-
 t/t4018-diff-funcname.sh   |  5 ---
 t/t4034-diff-words.sh  |  7 ++--
 t/t4202-log.sh | 28 +---
 t/t5520-pull.sh| 12 +++
 t/t5541-http-push.sh   |  3 +-
 t/t7500-commit.sh  |  6 ++--
 t/t7502-commit.sh  | 40 +--
 t/t7508-status.sh  | 46 +-
 t/t7600-merge.sh   | 60 +++---
 t/t7810-grep.sh|  5 ---
 t/t7811-grep-open.sh   |  5 ---
 t/t9500-gitweb-standalone-no-errors.sh |  3 +-
 14 files changed, 72 insertions(+), 154 deletions(-)

-- 
1.7.11.7

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html