Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
blame: move contents_from to scoreboard
[gitweb.git]
/
builtin
/
commit.c
diff --git
a/builtin/commit.c
b/builtin/commit.c
index 1d805f5da8abd1cfafc41c5c47fd048b2549fbf4..9028bfacf804b14a44b7590aa4ae95d60b772e50 100644
(file)
--- a/
builtin/commit.c
+++ b/
builtin/commit.c
@@
-1263,6
+1263,10
@@
static int parse_status_slot(const char *slot)
return WT_STATUS_NOBRANCH;
if (!strcasecmp(slot, "unmerged"))
return WT_STATUS_UNMERGED;
+ if (!strcasecmp(slot, "localBranch"))
+ return WT_STATUS_LOCAL_BRANCH;
+ if (!strcasecmp(slot, "remoteBranch"))
+ return WT_STATUS_REMOTE_BRANCH;
return -1;
}