@matheusbsbs / matheus-bagliano / commits / cc8e538d45

remote: actually check if remote exits

When converting the git remote command to a builtin in 211c89 ("Make git-remote a builtin"), a few calls to check if a remote exists were converted from: if (!exists $remote->{$name}) { [...] to: remote = remote_get(argv[1]); if (!remote) [...] The new check is not quite correct, because remote_get() never returns NULL if a name is given. This leaves us with the somewhat cryptic error message "error: Could not remove config section 'remote.test'", if we are trying to remove a remote that does not exist, or a similar error if we try to rename a remote. Use the remote_is_configured() function to check whether the remote actually exists, and die with a more sensible error message ("No such remote: $remotename") instead if it doesn't. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thomas Gummerer committed Feb 16, 2016 at 10:47 UTC cc8e538d45e4260b27196c3238e6f15d64236523

2 files changed +20 -2

builtin/remote.c

+2 -2

@@ -634,7 +634,7 @@ static int mv(int argc, const char **argv)

634 rename.remote_branches = &remote_branches;

635

636 oldremote = remote_get(rename.old);

637 - if (!oldremote)

637 + if (!remote_is_configured(oldremote))

638 die(_("No such remote: %s"), rename.old);

639

640 if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)

@@ -773,7 +773,7 @@ static int rm(int argc, const char **argv)

773 usage_with_options(builtin_remote_rm_usage, options);

774

775 remote = remote_get(argv[1]);

776 - if (!remote)

776 + if (!remote_is_configured(remote))

777 die(_("No such remote: %s"), argv[1]);

778

779 known_remotes.to_delete = remote;

t/t5505-remote.sh

+18

@@ -139,6 +139,24 @@ test_expect_success 'remove remote protects local branches' '

139 )

140 '

141

142 +test_expect_success 'remove errors out early when deleting non-existent branch' '

143 + (

144 + cd test &&

145 + echo "fatal: No such remote: foo" >expect &&

146 + test_must_fail git remote rm foo 2>actual &&

147 + test_i18ncmp expect actual

148 + )

149 +'

150 +

151 +test_expect_success 'rename errors out early when deleting non-existent branch' '

152 + (

153 + cd test &&

154 + echo "fatal: No such remote: foo" >expect &&

155 + test_must_fail git remote rename foo bar 2>actual &&

156 + test_i18ncmp expect actual

157 + )

158 +'

159 +

160 cat >test/expect <<EOF

161 * remote origin

162 Fetch URL: $(pwd)/one