Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/pack.h b/pack.h
index de941858c5f34d5964c472d70f1bd9dcabcb207a..9fc0945ac9162e542d32c0352ddf6b63e5438f40 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -93,7 +93,7 @@ char *index_pack_lockfile(int fd);
  */
 #define MAX_PACK_OBJECT_HEADER 10
 int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
-                                       enum object_type, uintmax_t);
+                                enum object_type, uintmax_t);
 
 #define PH_ERROR_EOF           (-1)
 #define PH_ERROR_PACK_SIGNATURE        (-2)