undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  am: don't persist keepcr flag
  mingw: give waitpid the correct signature
  git symbolic-ref: documentation fix
This commit is contained in:
Junio C Hamano 2011-12-09 13:34:18 -08:00
commit 51f737e350
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-symbolic-ref.txt
View File

@ -43,12 +43,9 @@ In the past, `.git/HEAD` was a symbolic link pointing at
`refs/heads/master`. When we wanted to switch to another branch, `refs/heads/master`. When we wanted to switch to another branch,
we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we wanted we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we wanted
to find out which branch we are on, we did `readlink .git/HEAD`. to find out which branch we are on, we did `readlink .git/HEAD`.
This was fine, and internally that is what still happens by But symbolic links are not entirely portable, so they are now
default, but on platforms that do not have working symlinks, deprecated and symbolic refs (as described above) are used by
or that do not have the `readlink(1)` command, this was a bit default.
cumbersome. On some platforms, `ln -sf` does not even work as
advertised (horrors). Therefore symbolic links are now deprecated
and symbolic refs are used by default.
'git symbolic-ref' will exit with status 0 if the contents of the 'git symbolic-ref' will exit with status 0 if the contents of the
symbolic ref were printed correctly, with status 1 if the requested symbolic ref were printed correctly, with status 1 if the requested

2
compat/mingw.c
View File

@ -1712,7 +1712,7 @@ char *getpass(const char *prompt)
return strbuf_detach(&buf, NULL); return strbuf_detach(&buf, NULL);
} }
pid_t waitpid(pid_t pid, int *status, unsigned options) pid_t waitpid(pid_t pid, int *status, int options)
{ {
HANDLE h = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION, HANDLE h = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
FALSE, pid); FALSE, pid);

2
compat/mingw.h
View File

@ -120,7 +120,7 @@ static inline int mingw_mkdir(const char *path, int mode)
#define mkdir mingw_mkdir #define mkdir mingw_mkdir
#define WNOHANG 1 #define WNOHANG 1
pid_t waitpid(pid_t pid, int *status, unsigned options); pid_t waitpid(pid_t pid, int *status, int options);
#define kill mingw_kill #define kill mingw_kill
int mingw_kill(pid_t pid, int sig); int mingw_kill(pid_t pid, int sig);

7
git-am.sh
View File

@ -530,7 +530,6 @@ else
echo "$sign" >"$dotest/sign" echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8" echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep" echo "$keep" >"$dotest/keep"
echo "$keepcr" >"$dotest/keepcr"
echo "$scissors" >"$dotest/scissors" echo "$scissors" >"$dotest/scissors"
echo "$no_inbody_headers" >"$dotest/no_inbody_headers" echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
echo "$GIT_QUIET" >"$dotest/quiet" echo "$GIT_QUIET" >"$dotest/quiet"
@ -576,12 +575,6 @@ if test "$(cat "$dotest/keep")" = t
then then
keep=-k keep=-k
fi fi
case "$(cat "$dotest/keepcr")" in
t)
keepcr=--keep-cr ;;
f)
keepcr=--no-keep-cr ;;
esac
case "$(cat "$dotest/scissors")" in case "$(cat "$dotest/scissors")" in
t) t)
scissors=--scissors ;; scissors=--scissors ;;