Fossil SCM
Bring the PATH= arguments for sync and patch into agreement.
Commit
b2619342c7e71e3ff57d803378fbb59b60306b51f8ce93906a41caf5fc6e4148
Parent
b1483634c628481…
2 files changed
+2
+4
-1
+2
| --- src/http_transport.c | ||
| +++ src/http_transport.c | ||
| @@ -141,10 +141,12 @@ | ||
| 141 | 141 | } |
| 142 | 142 | if( (pUrlData->flags & URL_SSH_EXE)==0 |
| 143 | 143 | && (pUrlData->flags & URL_SSH_PATH)!=0 |
| 144 | 144 | ){ |
| 145 | 145 | blob_append_escaped_arg(&zCmd, |
| 146 | + /* tag-20240206-b: | |
| 147 | + ** vvvv--- keep in sync with PATH= at tag-20240206-a */ | |
| 146 | 148 | "PATH=bin:/usr/local/bin:/opt/homebrew/bin:$PATH", 1); |
| 147 | 149 | } |
| 148 | 150 | blob_append_escaped_arg(&zCmd, pUrlData->fossil, 1); |
| 149 | 151 | blob_append(&zCmd, " test-http", 10); |
| 150 | 152 | if( pUrlData->path && pUrlData->path[0] ){ |
| 151 | 153 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -141,10 +141,12 @@ | |
| 141 | } |
| 142 | if( (pUrlData->flags & URL_SSH_EXE)==0 |
| 143 | && (pUrlData->flags & URL_SSH_PATH)!=0 |
| 144 | ){ |
| 145 | blob_append_escaped_arg(&zCmd, |
| 146 | "PATH=bin:/usr/local/bin:/opt/homebrew/bin:$PATH", 1); |
| 147 | } |
| 148 | blob_append_escaped_arg(&zCmd, pUrlData->fossil, 1); |
| 149 | blob_append(&zCmd, " test-http", 10); |
| 150 | if( pUrlData->path && pUrlData->path[0] ){ |
| 151 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -141,10 +141,12 @@ | |
| 141 | } |
| 142 | if( (pUrlData->flags & URL_SSH_EXE)==0 |
| 143 | && (pUrlData->flags & URL_SSH_PATH)!=0 |
| 144 | ){ |
| 145 | blob_append_escaped_arg(&zCmd, |
| 146 | /* tag-20240206-b: |
| 147 | ** vvvv--- keep in sync with PATH= at tag-20240206-a */ |
| 148 | "PATH=bin:/usr/local/bin:/opt/homebrew/bin:$PATH", 1); |
| 149 | } |
| 150 | blob_append_escaped_arg(&zCmd, pUrlData->fossil, 1); |
| 151 | blob_append(&zCmd, " test-http", 10); |
| 152 | if( pUrlData->path && pUrlData->path[0] ){ |
| 153 |
+4
-1
| --- src/patch.c | ||
| +++ src/patch.c | ||
| @@ -694,11 +694,14 @@ | ||
| 694 | 694 | transport_ssh_command(&cmd); |
| 695 | 695 | blob_appendf(&cmd, " -T"); |
| 696 | 696 | blob_append_escaped_arg(&cmd, zRemote, 0); |
| 697 | 697 | blob_init(&remote, 0, 0); |
| 698 | 698 | if( zFossilCmd==0 ){ |
| 699 | - blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0); | |
| 699 | + blob_append_escaped_arg(&cmd, | |
| 700 | + /* tag-20240206-a: | |
| 701 | + /* vvvv---- Keep in sync with the PATH= in tag-20240206-b */ | |
| 702 | + "PATH=$HOME/bin:/usr/local/bin:/opt/homebrew/bin:$PATH", 0); | |
| 700 | 703 | zFossilCmd = "fossil"; |
| 701 | 704 | } |
| 702 | 705 | blob_appendf(&remote, "%$ patch %s%s --dir64 %z -", |
| 703 | 706 | zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1)); |
| 704 | 707 | blob_append_escaped_arg(&cmd, blob_str(&remote), 0); |
| 705 | 708 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -694,11 +694,14 @@ | |
| 694 | transport_ssh_command(&cmd); |
| 695 | blob_appendf(&cmd, " -T"); |
| 696 | blob_append_escaped_arg(&cmd, zRemote, 0); |
| 697 | blob_init(&remote, 0, 0); |
| 698 | if( zFossilCmd==0 ){ |
| 699 | blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0); |
| 700 | zFossilCmd = "fossil"; |
| 701 | } |
| 702 | blob_appendf(&remote, "%$ patch %s%s --dir64 %z -", |
| 703 | zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1)); |
| 704 | blob_append_escaped_arg(&cmd, blob_str(&remote), 0); |
| 705 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -694,11 +694,14 @@ | |
| 694 | transport_ssh_command(&cmd); |
| 695 | blob_appendf(&cmd, " -T"); |
| 696 | blob_append_escaped_arg(&cmd, zRemote, 0); |
| 697 | blob_init(&remote, 0, 0); |
| 698 | if( zFossilCmd==0 ){ |
| 699 | blob_append_escaped_arg(&cmd, |
| 700 | /* tag-20240206-a: |
| 701 | /* vvvv---- Keep in sync with the PATH= in tag-20240206-b */ |
| 702 | "PATH=$HOME/bin:/usr/local/bin:/opt/homebrew/bin:$PATH", 0); |
| 703 | zFossilCmd = "fossil"; |
| 704 | } |
| 705 | blob_appendf(&remote, "%$ patch %s%s --dir64 %z -", |
| 706 | zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1)); |
| 707 | blob_append_escaped_arg(&cmd, blob_str(&remote), 0); |
| 708 |