aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-10-19 21:47:53 +0200
committerShawn O. Pearce <spearce@spearce.org>2007-10-21 01:30:39 -0400
commit98158e9cfd2808613f305bf587ce697762c884bb (patch)
tree87502b9a44bf4ca790f60ce8639a903e23b4ac7a /git-merge.sh
parentca5bb5d5390e4ec709ca3e11c451c58a836d4ee6 (diff)
downloadgit-98158e9cfd2808613f305bf587ce697762c884bb.tar.gz
git-98158e9cfd2808613f305bf587ce697762c884bb.tar.xz
Change git_connect() to return a struct child_process instead of a pid_t.
This prepares the API of git_connect() and finish_connect() to operate on a struct child_process. Currently, we just use that object as a placeholder for the pid that we used to return. A follow-up patch will change the implementation of git_connect() and finish_connect() to make full use of the object. Old code had early-return-on-error checks at the calling sites of git_connect(), but since git_connect() dies on errors anyway, these checks were removed. [sp: Corrected style nit of "conn == NULL" to "!conn"] Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions