Andrew's git / gitweb.git / diff
?
Merge branch 'ep/shell-assign-and-export-vars' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:22:57 +0000 (10:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:22:57 +0000 (10:22 -0700)
* ep/shell-assign-and-export-vars:
scripts: more "export VAR=VALUE" fixes
scripts: "export VAR=VALUE" construct is not portable

1  2 
git-remote-testgit.sh patch | diff1 | diff2 | blob | history
git-stash.sh patch | diff1 | diff2 | blob | history
t/t5560-http-backend-noserver.sh patch | diff1 | diff2 | blob | history
diff --cc git-remote-testgit.sh
index 1c006a0518e247d58759df98602f6dae3935caf6,cbf470f64f0b93c520ce55d1b93c866b669bfbaa..a9c75a2360fec7a9ce5f22877a471f70bc405ff1
--- 1/git-remote-testgit.sh
--- 2/git-remote-testgit.sh
+++ b/git-remote-testgit.sh
@@@ -13,10 -13,9 +13,11 @@@ refspec="${GIT_REMOTE_TESTGIT_REFSPEC-$
  
  test -z "$refspec" && prefix="refs"
  
- export GIT_DIR="$url/.git"
+ GIT_DIR="$url/.git"
+ export GIT_DIR
  
 +force=
 +
  mkdir -p "$dir"
  
  if test -z "$GIT_REMOTE_TESTGIT_NO_MARKS"
diff --cc git-stash.sh
Simple merge
diff --cc t/t5560-http-backend-noserver.sh
Simple merge