Thread (48 messages) 48 messages, 3 authors, 2021-07-06

Re: [RFC PATCH 10/35] update: add --ff option

From: Felipe Contreras <hidden>
Date: 2021-07-06 20:46:57

Ævar Arnfjörð Bjarmason wrote:
On Mon, Jul 05 2021, Felipe Contreras wrote:
quoted
 --------
 linkgit:git-fetch[1], linkgit:git-fast-forward[1],
diff --git a/builtin/update.c b/builtin/update.c
index 1a69896aa8..34681fe21a 100644
--- a/builtin/update.c
+++ b/builtin/update.c
@@ -7,12 +7,22 @@
 #include "run-command.h"
 #include "dir.h"
 
+enum update_mode_type {
+	UPDATE_MODE_FAST_FORWARD = 0
+};
Nit: If the value isn't important let's leave it out,
Yes, in one instantiation of the series it did matter, but not in the
current one. I'll drop it.
also if you add a trailing comma the subsequent commit where you add
another value is less churny. C supports that just fine.
I know, and I actually prefer that style, but I've seen the comma
dropped in many instances in the current code base. I was just following
the current style.

But if you prefer it as well I'll add it.

-- 
Felipe Contreras
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help