From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2011 22:37:42 +0000 (-0700)
Subject: Merge commit 'v1.6.0' into jc/checkout-reflog-fix
X-Git-Tag: v1.7.6.1~19^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4d9e42f8f11c57b32b976a943c8ddaf6214e64b8;p=git.git

Merge commit 'v1.6.0' into jc/checkout-reflog-fix

* commit 'v1.6.0': (2063 commits)
  GIT 1.6.0
  git-p4: chdir now properly sets PWD environment variable in msysGit
  Improve error output of git-rebase
  t9300: replace '!' with test_must_fail
  Git.pm: Make File::Spec and File::Temp requirement lazy
  Documentation: document the pager.* configuration setting
  git-stash: improve synopsis in help and manual page
  Makefile: building git in cygwin 1.7.0
  git-am: ignore --binary option
  bash-completion: Add non-command git help files to bash-completion
  Fix t3700 on filesystems which do not support question marks in names
  Utilise our new p4_read_pipe and p4_write_pipe wrappers
  Add p4 read_pipe and write_pipe wrappers
  bash completion: Add '--merge' long option for 'git log'
  bash completion: Add completion for 'git mergetool'
  git format-patch documentation: clarify what --cover-letter does
  bash completion: 'git apply' should use 'fix' not 'strip'
  t5304-prune: adjust file mtime based on system time rather than file mtime
  test-parse-options: use appropriate cast in length_callback
  Fix escaping of glob special characters in pathspecs
  ...

Conflicts:
	builtin-checkout.c
---

4d9e42f8f11c57b32b976a943c8ddaf6214e64b8
diff --cc builtin-checkout.c
index 141a9e187,411cc513c..cff017915
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@@ -383,18 -408,9 +410,10 @@@ static int switch_branches(struct check
  		return ret;
  
  	update_refs_for_switch(opts, &old, new);
- 	free((char *)old.path);
- 	return post_checkout_hook(old.commit, new->commit, 1);
- }
  
- static int branch_track = 0;
- 
- static int git_checkout_config(const char *var, const char *value)
- {
- 	if (!strcmp(var, "branch.autosetupmerge"))
- 		branch_track = git_config_bool(var, value);
- 
- 	return git_default_config(var, value);
+ 	ret = post_checkout_hook(old.commit, new->commit, 1);
++	free((char *)old.path);
+ 	return ret || opts->writeout_error;
  }
  
  int cmd_checkout(int argc, const char **argv, const char *prefix)