From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 7 Dec 2013 13:08:37 +0000 (-0600)
Subject: remote: fix status with branch...rebase=preserve
X-Git-Tag: v1.9-rc0~67^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0a54f709057729d0aa9f1e767e4f201834f14834?hp=--cc

remote: fix status with branch...rebase=preserve

Commit 66713ef (pull: allow pull to preserve merges when rebasing)
didn't include an update so 'git remote status' parses branch.<name>.rebase=preserve
correctly, let's do that.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

0a54f709057729d0aa9f1e767e4f201834f14834
diff --git a/builtin/remote.c b/builtin/remote.c
index 4e14891095..5e4ab66c26 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -309,8 +309,13 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 				space = strchr(value, ' ');
 			}
 			string_list_append(&info->merge, xstrdup(value));
-		} else
-			info->rebase = git_config_bool(orig_key, value);
+		} else {
+			int v = git_config_maybe_bool(orig_key, value);
+			if (v >= 0)
+				info->rebase = v;
+			else if (!strcmp(value, "preserve"))
+				info->rebase = 1;
+		}
 	}
 	return 0;
 }